diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-18 17:18:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-18 17:18:18 +0000 |
| commit | 511d34eedca27756cfbbfdd6b0e43d916745367a (patch) | |
| tree | 9e3421111c8e248a4a6a3b7e9e85c2fbba23babd /docker | |
| parent | a89fb921a1a8948241ca17ed1b92564725eb636a (diff) | |
| parent | e718f93872a070969050f60ce53a15c234c717a5 (diff) | |
Merge "LVM in cinder-volume container without udev"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/cinder-volume.yaml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 1f9003e6..8e4234c6 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -66,9 +66,15 @@ outputs: description: Role data for the Cinder Volume role. value: service_name: {get_attr: [CinderBase, role_data, service_name]} - config_settings: {get_attr: [CinderBase, role_data, config_settings]} + config_settings: + map_merge: + - get_attr: [CinderBase, role_data, config_settings] + - tripleo::profile::base::lvm::enable_udev: false step_config: &step_config - get_attr: [CinderBase, role_data, step_config] + list_join: + - "\n" + - - "include ::tripleo::profile::base::lvm" + - get_attr: [CinderBase, role_data, step_config] service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: |