openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add <service>_api_paste_ini in puppet_tags 

Most of the services are either missing or using deprecated tags for
paste deploy configuration. Add those for us to be able to customize
paste deploy.

Also, removes the unnecessary tag from nova-compute.

Change-Id: I699b9283c7dbdb59923007488b4ac6c359d6eced
This commit is contained in:
rabi 2021-08-09 09:24:31 +05:30 committed by Takashi Kajinami
parent 087a703fe1
commit 6d2901345a
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: cinder config_volume: cinder
puppet_tags: cinder_config,cinder_type,file,concat,file_line puppet_tags: cinder_config,cinder_type,file,concat,file_line,cinder_api_paste_ini
step_config: step_config:
list_join: list_join:
- "\n" - "\n"

2
deployment/designate/designate-api-container-puppet.yaml
View File

@ -128,7 +128,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: designate config_volume: designate
puppet_tags: designate_config puppet_tags: designate_config,designate_api_paste_ini
step_config: | step_config: |
include tripleo::profile::base::designate::api include tripleo::profile::base::designate::api
config_image: {get_param: ContainerDesignateConfigImage} config_image: {get_param: ContainerDesignateConfigImage}

2
deployment/heat/heat-api-container-puppet.yaml
View File

@ -181,7 +181,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: heat_api config_volume: heat_api
puppet_tags: heat_config,file,concat,file_line puppet_tags: heat_config,file,concat,file_line,heat_api_paste_ini
step_config: | step_config: |
include tripleo::profile::base::heat::api include tripleo::profile::base::heat::api
config_image: {get_param: ContainerHeatApiConfigImage} config_image: {get_param: ContainerHeatApiConfigImage}

2
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -410,7 +410,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: neutron config_volume: neutron
puppet_tags: neutron_config,neutron_api_config puppet_tags: neutron_config,neutron_api_paste_ini
step_config: step_config:
list_join: list_join:
- "\n" - "\n"

2
deployment/nova/nova-api-container-puppet.yaml
View File

@ -419,7 +419,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: nova config_volume: nova
puppet_tags: nova_config puppet_tags: nova_config,nova_api_paste_ini
step_config: step_config:
list_join: list_join:
- "\n" - "\n"

2
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1196,7 +1196,7 @@ outputs:
collectd::plugin::virt::connection: 'qemu:///system' collectd::plugin::virt::connection: 'qemu:///system'
puppet_config: puppet_config:
config_volume: nova_libvirt config_volume: nova_libvirt
puppet_tags: nova_config,nova_paste_api_ini puppet_tags: nova_config
step_config: | step_config: |
# TODO(emilien): figure how to deal with libvirt profile. # TODO(emilien): figure how to deal with libvirt profile.
# We'll probably treat it like we do with Neutron plugins. # We'll probably treat it like we do with Neutron plugins.

2
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -108,7 +108,7 @@ outputs:
- get_param: IronicApiMaxRetries - get_param: IronicApiMaxRetries
puppet_config: puppet_config:
config_volume: nova config_volume: nova
puppet_tags: nova_config,nova_paste_api_ini puppet_tags: nova_config
step_config: | step_config: |
include tripleo::profile::base::nova::compute::ironic include tripleo::profile::base::nova::compute::ironic
config_image: {get_param: ContainerNovaConfigImage} config_image: {get_param: ContainerNovaConfigImage}

2
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -202,7 +202,7 @@ outputs:
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: nova_metadata config_volume: nova_metadata
puppet_tags: nova_config puppet_tags: nova_config,nova_api_paste_ini
step_config: step_config:
list_join: list_join:
- "\n" - "\n"