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

diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index a19d0f8d..a6638be0 100644
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Nova Conductor service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -13,6 +17,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 +32,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'
@@ -42,9 +54,12 @@ resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       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 +82,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"