openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Clean up implementation to manage volume type by puppet"

Browse Source
This commit is contained in:
Zuul 2021-11-09 10:12:16 +00:00 committed by Gerrit Code Review
commit 5baf546ee7
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -224,7 +224,7 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: cinder
puppet_tags: cinder_config,cinder_type,file,concat,file_line,cinder_api_paste_ini
puppet_tags: cinder_config,file,concat,file_line,cinder_api_paste_ini
step_config:
list_join:
- "\n"
@ -346,18 +346,6 @@ outputs:
- /var/log/containers/httpd/cinder-api:/var/log/httpd:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
container_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/puppet-generated/cinder/etc/cinder/:/etc/cinder/:ro
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
deploy_steps_tasks: