X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-placement.yaml;h=86aa079e22c1693e76aec9868f734ab67b0b1628;hb=23c2378724a0287a8b4a8ba200b12ba1885cf362;hp=3ae19a67204de71124cff3962a990d84bdbbb1d4;hpb=7b2da488f51fc5b891b5831b54699ca412c5a09c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 3ae19a67..86aa079e 100644
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Nova Placement API service configured with Puppet
@@ -13,6 +13,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -52,6 +60,8 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
@@ -60,6 +70,8 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -124,7 +136,7 @@ outputs:
               - "%{hiera('mysql_bind_host')}"
       upgrade_tasks:
         - name: Stop nova_placement service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
         # The nova placement API isn't installed in newton images, so install
         # it on upgrade