Browse Source

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

tags/8.4.1
Zuul 1 month ago
parent
commit
c4f13f39e1

+ 12
- 1
docker/services/cinder-api.yaml View File

@@ -93,7 +93,7 @@ outputs:
93 93
       # BEGIN DOCKER SETTINGS
94 94
       puppet_config:
95 95
         config_volume: cinder
96
-        puppet_tags: cinder_config,file,concat,file_line
96
+        puppet_tags: cinder_config,cinder_type,file,concat,file_line
97 97
         step_config:
98 98
           list_join:
99 99
             - "\n"
@@ -216,6 +216,17 @@ outputs:
216 216
                   - /var/log/containers/httpd/cinder-api:/var/log/httpd
217 217
             environment:
218 218
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
219
+      docker_puppet_tasks:
220
+        # Create the default volume type after the cinder-api service is
221
+        # running. The puppet code will ensure this is only done once, on
222
+        # the bootstrap node.
223
+        step_4:
224
+          config_volume: 'cinder_init_tasks'
225
+          puppet_tags: cinder_config,cinder_type,file,concat,file_line
226
+          step_config: 'include ::tripleo::profile::base::cinder::api'
227
+          config_image: *cinder_api_image
228
+          volumes:
229
+            - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
219 230
 
220 231
       metadata_settings:
221 232
         get_attr: [CinderBase, role_data, metadata_settings]

+ 5
- 0
puppet/services/cinder-api.yaml View File

@@ -4,6 +4,10 @@ description: >
4 4
   OpenStack Cinder API service configured with Puppet
5 5
 
6 6
 parameters:
7
+  CinderDefaultVolumeType:
8
+    default: tripleo
9
+    description: The name of Cinder's default volume type.
10
+    type: string
7 11
   CinderEnableDBPurge:
8 12
     default: true
9 13
     description: |
@@ -115,6 +119,7 @@ outputs:
115 119
             cinder::keystone::authtoken::project_domain_name: 'Default'
116 120
             cinder::policy::policies: {get_param: CinderApiPolicies}
117 121
             cinder::ceilometer::notification_driver: {get_param: NotificationDriver}
122
+            cinder::api::default_volume_type: {get_param: CinderDefaultVolumeType}
118 123
             cinder::api::enable_proxy_headers_parsing: true
119 124
 
120 125
             cinder::api::nova_catalog_info: 'compute:nova:internalURL'

+ 7
- 0
releasenotes/notes/cinder-default-volume-type-cc21a256202eb476.yaml View File

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

Loading…
Cancel
Save