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

4 years ago · 4fa675c292
3 changed files with 3 additions and 0 deletions
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@ -76,6 +76,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
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@ -72,6 +72,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
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@ -80,6 +80,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