Merge "Disable ComputeNeutron* for cisco-nexus-ucsm"

[apex-tripleo-heat-templates.git] / puppet / services / sahara-engine.yaml

diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 987fe25..3e0070a 100644 (file)
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -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
@@ -34,6 +42,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:
@@ -51,8 +61,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