Merge "Customize scheduler_default_filters (nova.conf)"

[apex-tripleo-heat-templates.git] / puppet / services / ironic-api.yaml

diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index e185630..d0516e1 100644 (file)
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -45,11 +45,12 @@ outputs:
           # the TFTP server IP in ironic-conductor.yaml as it should not be
           # the VIP, but rather a real IP of the controller.
           - ironic::my_ip: {get_param: [EndpointMap, MysqlInternal, host]}
-            ironic::api::admin_password: {get_param: IronicPassword}
-            ironic::api::admin_tenant_name: 'service'
-            ironic::api::admin_user: 'ironic'
-            ironic::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-            ironic::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            ironic::api::authtoken::password: {get_param: IronicPassword}
+            ironic::api::authtoken::project_name: 'service'
+            ironic::api::authtoken::username: 'ironic'
+            ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+            ironic::api::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            ironic::api::host_ip: {get_input: ironic_api_network}
             ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]}
             # This is used to build links in responses
             ironic::api::public_endpoint: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]}
@@ -59,5 +60,10 @@ outputs:
             ironic::keystone::auth::auth_name: 'ironic'
             ironic::keystone::auth::password: {get_param: IronicPassword }
             ironic::keystone::auth::tenant: 'service'
+            tripleo.ironic_api.firewall_rules:
+              '133 ironic api':
+                dport:
+                  - 6385
+                  - 13385
       step_config: |
         include ::tripleo::profile::base::ironic::api