Merge "Modify pci_passthrough hiera value as string"

[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 a84df53..e24d0de 100644 (file)
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -49,8 +49,10 @@ outputs:
           - get_attr: [IronicBase, role_data, config_settings]
           - ironic::api::authtoken::password: {get_param: IronicPassword}
             ironic::api::authtoken::project_name: 'service'
+            ironic::api::authtoken::user_domain_name: 'Default'
+            ironic::api::authtoken::project_domain_name: 'Default'
             ironic::api::authtoken::username: 'ironic'
-            ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+            ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             ironic::api::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples
@@ -88,5 +90,5 @@ outputs:
             - "%{hiera('mysql_bind_host')}"
       upgrade_tasks:
         - name: Stop ironic_api service
-          tags: step2
+          tags: step1
           service: name=openstack-ironic-api state=stopped