Merge "Deploy versionless keystone endpoints (for keystone only)"

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

diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 82b8356..3ae19a6 100644 (file)
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -79,6 +79,10 @@ outputs:
               dport:
                 - 8778
                 - 13778
+          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
@@ -86,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
@@ -118,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: step2
+          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