openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "added level of indirection causes incorrect hiera config"

Browse Source
This commit is contained in:
Zuul 2017-11-01 19:27:35 +00:00 committed by Gerrit Code Review
commit 2b7ccf6159
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
View File

@ -24,17 +24,16 @@ resources:
config:
datafiles:
neutron_bigswitch_data:
mapped_data:
neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
# NOTE(aschultz): required for the puppet module but we don't
# actually want them defined on the compute nodes so we're
# relying on the puppet module's handling of <SERVICE DEFAULT>
# to just not set these but still accept that they were defined.
# This will should be fixed in puppet-neutron and removed here,
# but for backportability, we need to define something.
neutron::plugins::ml2::bigswitch::restproxy::servers: '<SERVICE DEFAULT>'
neutron::plugins::ml2::bigswitch::restproxy::server_auth: '<SERVICE DEFAULT>'
neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
# NOTE(aschultz): required for the puppet module but we don't
# actually want them defined on the compute nodes so we're
# relying on the puppet module's handling of <SERVICE DEFAULT>
# to just not set these but still accept that they were defined.
# This will should be fixed in puppet-neutron and removed here,
# but for backportability, we need to define something.
neutron::plugins::ml2::bigswitch::restproxy::servers: '<SERVICE DEFAULT>'
neutron::plugins::ml2::bigswitch::restproxy::server_auth: '<SERVICE DEFAULT>'
NeutronBigswitchDeployment:

19
puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
View File

@ -50,16 +50,15 @@ resources:
config:
datafiles:
neutron_bigswitch_data:
mapped_data:
neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
NeutronBigswitchDeployment:
type: OS::Heat::StructuredDeployment