Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / cinder-api.yaml

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 0e3cecc..193c6ba 100644 (file)
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Cinder API service configured with Puppet
@@ -13,6 +13,10 @@ parameters:
     description: The password for the cinder service account, used by cinder-api.
     type: string
     hidden: true
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -22,6 +26,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 +64,12 @@ parameters:
       e.g. { cinder-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
+  NotificationDriver:
+    type: string
+    default: 'messagingv2'
+    description: Driver or drivers to handle sending notifications.
+    constraints:
+      - allowed_values: [ 'messagingv2', 'noop' ]
 
 conditions:
   cinder_workers_zero: {equals : [{get_param: CinderWorkers}, 0]}
@@ -61,17 +79,23 @@ resources:
   ApacheServiceBase:
     type: ./apache.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}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   CinderBase:
     type: ./cinder-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:
@@ -93,6 +117,7 @@ outputs:
             cinder::keystone::authtoken::user_domain_name: 'Default'
             cinder::keystone::authtoken::project_domain_name: 'Default'
             cinder::policy::policies: {get_param: CinderApiPolicies}
+            cinder::ceilometer::notification_driver: {get_param: NotificationDriver}
             cinder::api::enable_proxy_headers_parsing: true
 
             cinder::api::nova_catalog_info: 'compute:nova:internalURL'
@@ -159,31 +184,28 @@ outputs:
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
-        yaql:
-          expression: $.data.apache_upgrade + $.data.cinder_api_upgrade
-          data:
-            apache_upgrade:
-              get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-            cinder_api_upgrade:
-              - name: Check if cinder_api is deployed
-                command: systemctl is-enabled openstack-cinder-api
-                tags: common
-                ignore_errors: True
-                register: cinder_api_enabled
-              - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
-                shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
-                when: cinder_api_enabled.rc == 0
-                tags: step0,validation
-              - name: check for cinder running under apache (post upgrade)
-                tags: step1
-                shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
-                register: cinder_apache
-                ignore_errors: true
-              - name: Stop cinder_api service (running under httpd)
-                tags: step1
-                service: name=httpd state=stopped
-                when: cinder_apache.rc == 0
-              - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
-                tags: step1
-                when: cinder_api_enabled.rc == 0
-                service: name=openstack-cinder-api state=stopped enabled=no
+        list_concat:
+          - get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
+          -
+            - name: Check if cinder_api is deployed
+              command: systemctl is-enabled openstack-cinder-api
+              tags: common
+              ignore_errors: True
+              register: cinder_api_enabled
+            - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
+              shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
+              when: cinder_api_enabled.rc == 0
+              tags: step0,validation
+            - name: check for cinder running under apache (post upgrade)
+              tags: step1
+              shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
+              register: cinder_apache
+              ignore_errors: true
+            - name: Stop cinder_api service (running under httpd)
+              tags: step1
+              service: name=httpd state=stopped
+              when: cinder_apache.rc == 0
+            - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
+              tags: step1
+              when: cinder_api_enabled.rc == 0
+              service: name=openstack-cinder-api state=stopped enabled=no