From 51269a1e22793d858dca56fd7f362efc2c387f55 Mon Sep 17 00:00:00 2001 From: Juan Badia Payno Date: Fri, 13 Apr 2018 13:40:43 +0200 Subject: [PATCH] Add the service_config_settings from {{service-name}} base 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 --- docker/services/neutron-l3.yaml | 1 + docker/services/neutron-metadata.yaml | 1 + docker/services/neutron-ovs-agent.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index 6f4b8cabbb..a3878703cb 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -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 diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index dc4630f3c7..7968ed5c31 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -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 diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 3dc7d6e4d8..b04d9e2a64 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -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