X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fhieradata%2Fcontroller.yaml;h=798e63f61dcfd0e0bf1e90540acdeef43e981100;hb=9c9c27e17e27c67e734c2da7519cbb1b30ce2ded;hp=3cc64971d24c7f5b64e4188613dd27da93a95611;hpb=1ce0f9db531a40e0c3915906a24c002d8ed3eae6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 3cc64971..798e63f6 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -40,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'
@@ -58,6 +61,7 @@ swift::proxy::account_autocreate: true
 
 # glance
 glance::api::pipeline: 'keystone'
+glance::api::show_image_direct_url: true
 glance::registry::pipeline: 'keystone'
 glance::backend::swift::swift_store_create_container_on_put: true
 glance::backend::rbd::rbd_store_user: 'openstack'
@@ -72,6 +76,11 @@ 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
@@ -79,10 +88,13 @@ cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterSch
 # heat
 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: '*'
@@ -90,6 +102,7 @@ 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