openstack/tripleo-heat-templates
Code Issues Proposed changes

Add the service_config_settings from {{service-name}} base

Browse Source 
Some container yaml file does not get the
service_config_settings from the base file.

This patch makes for the following docker yaml files get
the service_config_settings:
 docker/services/neutron-l3.yaml
 docker/services/neutron-metadata.yaml
 docker/services/neutron-ovs-agent.yaml

Related-Bug: #1757066

Change-Id: Ifc8def10da0b10decd12efaab4452ff46f3c685b
This commit is contained in:
Juan Badia Payno 2018-04-13 13:40:43 +02:00
parent 83fdc0b30b
commit 51269a1e22
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/services/neutron-l3.yaml
View File

@ -72,6 +72,7 @@ outputs:
- get_attr: [NeutronLogging, config_settings]
logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronL3Base, role_data, service_config_settings]}
puppet_config:
puppet_tags: neutron_config,neutron_l3_agent_config
config_volume: neutron

1
docker/services/neutron-metadata.yaml
View File

@ -68,6 +68,7 @@ outputs:
- get_attr: [NeutronLogging, config_settings]
logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronMetadataBase, role_data, service_config_settings]}
puppet_config:
puppet_tags: neutron_config,neutron_metadata_agent_config
config_volume: neutron

1
docker/services/neutron-ovs-agent.yaml
View File

@ -76,6 +76,7 @@ outputs:
- get_attr: [NeutronLogging, config_settings]
logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronOvsAgentBase, role_data, service_config_settings]}
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2