X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fhieradata%2Fcontroller.yaml;h=4f46c7fb291276a84f2d35bf42000613c3cac37a;hb=9c9c27e17e27c67e734c2da7519cbb1b30ce2ded;hp=76488457dbf1ac606c0120b28286f78a167a60b2;hpb=92377361c76a612457cc147a0608d94db430a771;p=apex-tripleo-heat-templates.git

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 76488457..798e63f6 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -5,13 +5,24 @@ nova::consoleauth::enabled: true
 nova::vncproxy::enabled: true
 nova::scheduler::enabled: true
 
+# rabbitmq
 rabbitmq::delete_guest_user: false
 rabbitmq::wipe_db_on_cookie_change: true
 rabbitmq::port: '5672'
 rabbitmq::package_source: undef
 rabbitmq::repos_ensure: false
+rabbitmq_environment:
+  RABBITMQ_NODENAME: "rabbit@%{::hostname}"
+  RABBITMQ_SERVER_ERL_ARGS: '"+K true +A30 +P 1048576 -kernel inet_default_connect_options [{nodelay,true},{raw,6,18,<<5000:64/native>>}] -kernel inet_default_listen_options [{raw,6,18,<<5000:64/native>>}]"'
+rabbitmq_kernel_variables:
+  inet_dist_listen_min: '35672'
+  inet_dist_listen_max: '35672'
+rabbitmq_config_variables:
+  tcp_listen_options: '[binary, {packet, raw}, {reuseaddr, true}, {backlog, 128}, {nodelay, true}, {exit_on_close, false}, {keepalive, true}]'
+  cluster_partition_handling: 'pause_minority'
 
 mongodb::server::replset: tripleo
+mongodb::server::journal: false
 
 redis::port: 6379
 redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}"
@@ -29,6 +40,9 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
 ceilometer::api::keystone_tenant: 'service'
 heat::keystone_tenant: 'service'
 
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+
 #swift
 swift::proxy::pipeline:
   - 'catch_errors'
@@ -38,7 +52,6 @@ swift::proxy::pipeline:
   - 'tempurl'
   - 'formpost'
   - 'staticweb'
-  - 'ceilometer'
   - 'authtoken'
   - 'keystone'
   - 'proxy-logging'
@@ -48,8 +61,8 @@ swift::proxy::account_autocreate: true
 
 # glance
 glance::api::pipeline: 'keystone'
+glance::api::show_image_direct_url: true
 glance::registry::pipeline: 'keystone'
-glance::registry::manage_service: true
 glance::backend::swift::swift_store_create_container_on_put: true
 glance::backend::rbd::rbd_store_user: 'openstack'
 
@@ -57,32 +70,40 @@ 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::plugins::ml2::tunnel_id_ranges:
-  - '1:1000'
 neutron::server::sync_db: true
 neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
 
 # nova
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::osapi_v3: true
+nova::scheduler::filter::ram_allocation_ratio: '1.0'
+
+nova::config::nova_config:
+  DEFAULT/default_floating_pool:
+    value: 'public'
 
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
 
 # heat
-heat::engine::heat_stack_user_role: ''
 heat::engine::configure_delegated_roles: false
 heat::engine::trusts_delegated_roles: []
+heat::instance_user: ''
 
 # pacemaker
 pacemaker::corosync::cluster_name: 'tripleo_cluster'
 pacemaker::corosync::manage_fw: false
+pacemaker::resource_defaults::defaults:
+  resource-stickiness: { value: INFINITY }
 
 # horizon
 horizon::allowed_hosts: '*'
+horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
 
+# mysql
 mysql::server::manage_config_file: true
+mysql::server::remove_default_accounts: true
+
 
 tripleo::loadbalancer::keystone_admin: true
 tripleo::loadbalancer::keystone_public: true
@@ -95,10 +116,12 @@ tripleo::loadbalancer::nova_osapi: true
 tripleo::loadbalancer::nova_metadata: true
 tripleo::loadbalancer::nova_novncproxy: true
 tripleo::loadbalancer::mysql: true
-tripleo::loadbalancer::rabbitmq: true
 tripleo::loadbalancer::redis: true
 tripleo::loadbalancer::swift_proxy_server: true
 tripleo::loadbalancer::ceilometer: true
 tripleo::loadbalancer::heat_api: true
 tripleo::loadbalancer::heat_cloudwatch: true
 tripleo::loadbalancer::heat_cfn: true
+tripleo::loadbalancer::horizon: true
+
+controller_classes: []