aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-31 12:40:32 +0000
committerGerrit Code Review <review@openstack.org>2016-05-31 12:40:32 +0000
commit9f45b39cd880980640cf369382dd92c35424e1ca (patch)
treed3ad342a3efd71ff4028568c8ad61bdb69910de8 /puppet/extraconfig
parente3cc44579c0e632eb72c3ea9f58f2ab2bc27a251 (diff)
parent4087aff69b13843ab73538c65b4b5823d46fb629 (diff)
Merge "loadbalancer: update hiera parameters for HAproxy/keepalived split"
Diffstat (limited to 'puppet/extraconfig')
-rw-r--r--puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
index 26ce7138..3e455347 100644
--- a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
+++ b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
@@ -85,7 +85,7 @@ resources:
tripleo::cluster::cassandra::ssl_storage_port: {get_param: CassandraSslStoragePort}
tripleo::cluster::cassandra::client_port: {get_param: CassandraClientPort}
tripleo::cluster::cassandra::client_port_thrift: {get_param: CassandraClientPortThrift}
- tripleo::loadbalancer::midonet_api: true
+ tripleo::haproxy::midonet_api: true
# Missed Neutron Puppet data
neutron::agents::dhcp::interface_driver: 'neutron.agent.linux.interface.MidonetInterfaceDriver'
neutron::agents::dhcp::dhcp_driver: 'midonet.neutron.agent.midonet_driver.DhcpNoOpDriver'