X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-placement.yaml;h=b59e2fc67c636f5fb613071b6c1b5c3b6b0bb90f;hb=d22484d389b1e2f5e9dd9ea6d9f4196effa31f1c;hp=9b7120d871a6fdd12a15d88b21a0dc68f32535dc;hpb=739e90e4630169752e28e4c9bb97f5bbcbb0ebb5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 9b7120d8..b59e2fc6 100644
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -79,10 +79,10 @@ outputs:
               dport:
                 - 8778
                 - 13778
-          nova::placement::project_name: 'service'
-          nova::placement::password: {get_param: NovaPassword}
-          nova::placement::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
-          nova::placement::os_region_name: {get_param: KeystoneRegion}
+          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::wsgi::apache_placement::api_port: '8778'
           nova::wsgi::apache_placement::ssl: {get_param: EnableInternalTLS}
           # NOTE: bind IP is found in Heat replacing the network name with the local node IP
@@ -90,13 +90,13 @@ outputs:
           # internal_api -> IP
           # internal_api_uri -> [IP]
           # internal_api_subnet - > IP/CIDR
-          nova::wsgi::apache_placement::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
+          nova::wsgi::apache_placement::bind_host: {get_param: [ServiceNetMap, NovaPlacementNetwork]}
           nova::wsgi::apache_placement::servername:
             str_replace:
               template:
                 "%{hiera('fqdn_$NETWORK')}"
               params:
-                $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
+                $NETWORK: {get_param: [ServiceNetMap, NovaPlacementNetwork]}
         -
           if:
           - nova_workers_zero
@@ -122,3 +122,12 @@ outputs:
             nova::db::mysql_placement::allowed_hosts:
               - '%'
               - "%{hiera('mysql_bind_host')}"
+      upgrade_tasks:
+        - name: Stop nova_placement service (running under httpd)
+          tags: step1
+          service: name=httpd state=stopped
+        # The nova placement API isn't installed in newton images, so install
+        # it on upgrade
+        - name: Install nova-placement packages on upgrade
+          tags: step3
+          yum: name=openstack-nova-placement-api state=latest