From 315fa319630fa22ee9e31a058a2a17376b5f1ea3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 13 Jul 2016 11:29:43 -0400 Subject: Migrate Puppet Hieradata to composable services Migrate puppet/hieradata/*.yaml parameters to puppet/services/*.yaml except for some services that are not composable yet. Co-Authored-By: Juan Antonio Osorio Robles Change-Id: I7e5f8b18ee9aa63a1dffc6facaf88315b07d5fd7 --- puppet/services/neutron-base.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'puppet/services/neutron-base.yaml') diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 301759c7..a1757461 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -61,4 +61,7 @@ outputs: params: PLUGINS: {get_param: NeutronServicePlugins} neutron::debug: {get_param: Debug} - neutron::host: '"%{::fqdn}"' + neutron::allow_overlapping_ips: true + neutron::rabbit_heartbeat_timeout_threshold: 60 + neutron::host: '"%{::fqdn}"' #NOTE: extra quoting is needed + neutron::keystone::auth::tenant: 'service' -- cgit 1.2.3-korg