Merge "Convert port cidr splitting to str_split"

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

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 13f4eec..e00fffa 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -87,9 +87,11 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::default_floating_pool: 'public'
 nova::api::osapi_v3: true
+nova::api::sync_db_api: true
 nova::scheduler::filter::ram_allocation_ratio: '1.0'
 nova::cron::archive_deleted_rows::hour: '*/12'
 nova::cron::archive_deleted_rows::destination: '/dev/null'
+nova::notification_driver: messaging
 
 # ceilometer
 ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
@@ -97,9 +99,7 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
 cinder::cron::db_purge::destination: '/dev/null'
-cinder::config::cinder_config:
-  DEFAULT/host:
-    value: hostgroup
+cinder::host: hostgroup
 
 # heat
 heat::engine::configure_delegated_roles: false