Merge "Modify pci_passthrough hiera value as string"

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

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 9e097d9..473c24b 100644 (file)
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -110,9 +110,11 @@ outputs:
                 - 13774
                 - 8775
           nova::keystone::authtoken::project_name: 'service'
+          nova::keystone::authtoken::user_domain_name: 'Default'
+          nova::keystone::authtoken::project_domain_name: 'Default'
           nova::keystone::authtoken::password: {get_param: NovaPassword}
-          nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-          nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+          nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
+          nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
           nova::api::enabled: true
           nova::api::default_floating_pool: {get_param: NovaDefaultFloatingPool}
           nova::api::sync_db_api: true
@@ -194,9 +196,6 @@ outputs:
           tags: step0,pre-upgrade
           when: is_bootstrap_node
           command: nova-manage db online_data_migrations
-        - name: update nova api
-          tags: step2
-          yum: name=openstack-nova-api state=latest
         - name: Stop and disable nova_api service (pre-upgrade not under httpd)
           tags: step2
           service: name=openstack-nova-api state=stopped enabled=no