X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-conductor.yaml;h=b83b9852c8d27faa502b5f694ca02f96477e1057;hb=fb5eb77331006fe34991189b1f84c3ebb6c00132;hp=a19d0f8d86fea3dbd513b881963e17651c59ca35;hpb=ef0ce3e86af585621d02abda8d1a88101c5c82c9;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index a19d0f8d..b83b9852 100644
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Nova Conductor 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
@@ -20,7 +28,7 @@ parameters:
     type: json
   NovaWorkers:
     default: 0
-    description: Number of workers for Nova Conductor service.
+    description: Number of workers for Nova services.
     type: number
   MonitoringSubscriptionNovaConductor:
     default: 'overcloud-nova-conductor'
@@ -45,6 +53,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:
@@ -67,12 +77,12 @@ outputs:
         include tripleo::profile::base::nova::conductor
       upgrade_tasks:
         - name: Stop nova_conductor service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-conductor state=stopped
         # If not already set by puppet (e.g a pre-ocata version), set the
         # upgrade_level for compute to "auto"
         - name: Set compute upgrade level to auto
-          tags: step2
+          tags: step1
           ini_file:
             str_replace:
               template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"