Adds horizon to pacemaker when puppet-pacemaker is enabled

[apex-tripleo-heat-templates.git] / puppet / hieradata / controller.yaml

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 1748ccd..99ec0e9 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -59,7 +59,6 @@ swift::proxy::account_autocreate: true
 # glance
 glance::api::pipeline: 'keystone'
 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'
 
@@ -68,8 +67,6 @@ 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
 
@@ -91,6 +88,8 @@ pacemaker::corosync::manage_fw: false
 
 # horizon
 horizon::allowed_hosts: '*'
+horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
+
 
 mysql::server::manage_config_file: true