X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fsahara-engine.yaml;h=b58e3ec2540251d9bd97980d8c418c9c4e069885;hb=0602e95351f3b402fa4fc17478061a000ecde5bd;hp=987fe25b6d065d2b98f2cd671fd1148f6a18c11e;hpb=c59d305fa2c82f25238f2998727509dc2de601cf;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 987fe25b..b58e3ec2 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Sahara Engine 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
@@ -31,9 +43,12 @@ resources:
   SaharaBase:
     type: ./sahara-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:
@@ -51,8 +66,5 @@ outputs:
         include ::tripleo::profile::base::sahara::engine
       upgrade_tasks:
         - name: Stop sahara_engine service
-          tags: step2
+          tags: step1
           service: name=openstack-sahara-engine state=stopped
-        - name: Sync sahara_engine DB
-          tags: step5
-          command: sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head