Merge "Ensure Cinder has a default volume type" into stable/queens

docker/services/cinder-api.yaml

@@ -93,7 +93,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder
-        puppet_tags: cinder_config,file,concat,file_line
+        puppet_tags: cinder_config,cinder_type,file,concat,file_line
         step_config:
           list_join:
             - "\n"
@@ -216,6 +216,17 @@ outputs:
                   - /var/log/containers/httpd/cinder-api:/var/log/httpd
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      docker_puppet_tasks:
+        # Create the default volume type after the cinder-api service is
+        # running. The puppet code will ensure this is only done once, on
+        # the bootstrap node.
+        step_4:
+          config_volume: 'cinder_init_tasks'
+          puppet_tags: cinder_config,cinder_type,file,concat,file_line
+          step_config: 'include ::tripleo::profile::base::cinder::api'
+          config_image: *cinder_api_image
+          volumes:
+            - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
 
       metadata_settings:
         get_attr: [CinderBase, role_data, metadata_settings]

puppet/services/cinder-api.yaml

@@ -4,6 +4,10 @@ description: >
   OpenStack Cinder API service configured with Puppet
 
 parameters:
+  CinderDefaultVolumeType:
+    default: tripleo
+    description: The name of Cinder's default volume type.
+    type: string
   CinderEnableDBPurge:
     default: true
     description: |
@@ -115,6 +119,7 @@ outputs:
             cinder::keystone::authtoken::project_domain_name: 'Default'
             cinder::policy::policies: {get_param: CinderApiPolicies}
             cinder::ceilometer::notification_driver: {get_param: NotificationDriver}
+            cinder::api::default_volume_type: {get_param: CinderDefaultVolumeType}
             cinder::api::enable_proxy_headers_parsing: true
 
             cinder::api::nova_catalog_info: 'compute:nova:internalURL'

releasenotes/notes/cinder-default-volume-type-cc21a256202eb476.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Avoid life cycle issues with Cinder volumes by ensuring Cinder has a
+    default volume type. The name of the default volume type is controlled by
+    a new CinderDefaultVolumeType parameter, which defaults to "tripleo".
+    Fixes `bug 1782217 <https://bugs.launchpad.net/tripleo/+bug/1782217>`__.