X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-api.yaml;h=0adefecdb091f39f89b5dd5f77c6b3d7a0f0f313;hb=10ba1fa6068978d5779da4b3c6966d73e893a7e5;hp=9e097d92e45e2cd6dd136e9e9066e5cd4bb5f487;hpb=5353f1c7c9cd4408d10745206165aa4950ad76c6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 9e097d92..0adefecd 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -112,7 +112,7 @@ outputs:
           nova::keystone::authtoken::project_name: 'service'
           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_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,12 +194,12 @@ 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
+        - name: update nova api
+          tags: step2
+          yum: name=openstack-nova-api state=latest
         - name: Create puppet manifest to set transport_url in nova.conf
           tags: step5
           when: is_bootstrap_node