aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r--puppet/hieradata/controller.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index cdd1d3ae..25719709 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -22,6 +22,7 @@ rabbitmq_config_variables:
cluster_partition_handling: 'pause_minority'
mongodb::server::replset: tripleo
+mongodb::server::journal: false
redis::port: 6379
redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}"
@@ -65,7 +66,6 @@ glance::backend::rbd::rbd_store_user: 'openstack'
neutron::core_plugin: 'ml2'
neutron::service_plugins:
- 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'
-neutron::dhcp_agents_per_network: 2
neutron::server::sync_db: true
neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
@@ -73,12 +73,17 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
nova::notify_on_state_change: 'vm_and_task_state'
nova::api::osapi_v3: true
+nova::config::nova_config:
+ DEFAULT/default_floating_pool:
+ value: 'public'
+
# cinder
cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
# heat
heat::engine::configure_delegated_roles: false
heat::engine::trusts_delegated_roles: []
+heat::instance_user: ''
# pacemaker
pacemaker::corosync::cluster_name: 'tripleo_cluster'