6 files changed, 29 insertions, 7 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index 280457df..6eb0e671 100644
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -11,3 +11,5 @@ ceph_pools:
   - volumes
   - vms
   - images
+
+ceph_classes: []
+\ No newline at end of file
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 40c44aef..272a6688 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,10 +13,7 @@ nova::network::neutron::vif_plugging_is_fatal: false
 nova::network::neutron::vif_plugging_timeout: 30
 nova::network::neutron::dhcp_domain: ''
 
-neutron::plugins::ml2::tunnel_id_ranges:
-  - '1:1000'
-neutron::plugins::ml2::vni_ranges:
-  - '1:1000'
+neutron::allow_overlapping_ips: true
 neutron::plugins::ml2::type_drivers:
   - flat
   - gre
@@ -29,4 +26,4 @@ sysctl_settings:
   net.ipv4.tcp_keepalive_probes:
     value: 5
   net.ipv4.tcp_keepalive_time:
-    value: 5
-\ No newline at end of file
+    value: 5
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 4915d3c8..bb49bb90 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,4 +15,12 @@ nova::compute::rbd::rbd_keyring: 'client.openstack'
 nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
 nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
+nova::config::nova_config:
+  cinder/catalog_info:
+    value: 'volumev2:cinderv2:internalURL'
+  DEFAULT/default_floating_pool:
+    value: 'public'
+
 ceilometer::agent::auth::auth_tenant_name: 'service'
+
+compute_classes: []
+\ No newline at end of file
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 77c0e7ec..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,11 +73,14 @@ 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::heat_stack_user_role: ''
 heat::engine::configure_delegated_roles: false
 heat::engine::trusts_delegated_roles: []
 heat::instance_user: ''
@@ -112,3 +115,5 @@ tripleo::loadbalancer::heat_api: true
 tripleo::loadbalancer::heat_cloudwatch: true
 tripleo::loadbalancer::heat_cfn: true
 tripleo::loadbalancer::horizon: true
+
+controller_classes: []
diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
index 59a8b1cf..3a379035 100644
--- a/puppet/hieradata/object.yaml
+++ b/puppet/hieradata/object.yaml
@@ -14,3 +14,5 @@ swift::proxy::keystone::operator_roles:
   - admin
   - swiftoperator
   - ResellerAdmin
+
+object_classes: []
+\ No newline at end of file
diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml
index ad9e2c2a..f4cd78a9 100644
--- a/puppet/hieradata/volume.yaml
+++ b/puppet/hieradata/volume.yaml
@@ -2,3 +2,11 @@
 
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
+
+cinder::config::cinder_config:
+  DEFAULT/nova_catalog_info:
+    value: 'compute:Compute Service:internalURL'
+  DEFAULT/swift_catalog_info:
+    value: 'object-store:swift:internalURL'
+
+volume_classes: []
+\ No newline at end of file