7 files changed, 108 insertions, 24 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index 280457df..ca6d3954 100644
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -7,7 +7,6 @@ ceph::profile::params::osds: {/srv/data: {}}
 ceph::profile::params::manage_repo: false
 ceph::profile::params::authentication_type: cephx
 
-ceph_pools:
-  - volumes
-  - vms
-  - images
+ceph_classes: []
+
+ceph_osd_selinux_permissive: true
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 40c44aef..030f661d 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,15 +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::plugins::ml2::type_drivers:
-  - flat
-  - gre
-  - vxlan
-  - vlan
+neutron::allow_overlapping_ips: true
 
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
@@ -29,4 +21,13 @@ sysctl_settings:
   net.ipv4.tcp_keepalive_probes:
     value: 5
   net.ipv4.tcp_keepalive_time:
-    value: 5
-\ No newline at end of file
+    value: 5
+
+nova::rabbit_heartbeat_timeout_threshold: 60
+neutron::rabbit_heartbeat_timeout_threshold: 60
+cinder::rabbit_heartbeat_timeout_threshold: 60
+ceilometer::rabbit_heartbeat_timeout_threshold: 60
+heat::rabbit_heartbeat_timeout_threshold: 60
+keystone::rabbit_heartbeat_timeout_threshold: 60
+
+nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 4915d3c8..173020f8 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -10,9 +10,9 @@ nova::compute::vnc_enabled: true
 nova::compute::libvirt::vncserver_listen: '0.0.0.0'
 nova::compute::libvirt::migration_support: true
 
-nova::compute::rbd::libvirt_rbd_user: 'openstack'
-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')}"
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
+ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
+
+compute_classes: []
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 3de9bd91..a4914c0e 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')}"
@@ -39,6 +40,11 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
 ceilometer::api::keystone_tenant: 'service'
 heat::keystone_tenant: 'service'
 
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+keystone::roles::admin::service_tenant: 'service'
+keystone::roles::admin::admin_tenant: 'admin'
+
 #swift
 swift::proxy::pipeline:
   - 'catch_errors'
@@ -47,9 +53,9 @@ swift::proxy::pipeline:
   - 'ratelimit'
   - 'tempurl'
   - 'formpost'
-  - 'staticweb'
   - 'authtoken'
   - 'keystone'
+  - 'staticweb'
   - 'proxy-logging'
   - 'proxy-server'
 
@@ -57,37 +63,45 @@ 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'
+glance_file_pcmk_directory: '/var/lib/glance/images'
 
 # neutron
-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
 
 # nova
 nova::notify_on_state_change: 'vm_and_task_state'
+nova::api::default_floating_pool: 'public'
 nova::api::osapi_v3: true
+nova::scheduler::filter::ram_allocation_ratio: '1.0'
+
+# ceilometer
+ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 
 # 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::cache_backend: django.core.cache.backends.memcached.MemcachedCache
 horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
+horizon::vhost_extra_params:
+  add_listen: false
+  priority: 10
 
 # mysql
 mysql::server::manage_config_file: true
@@ -111,3 +125,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/database.yaml b/puppet/hieradata/database.yaml
new file mode 100644
index 00000000..7e925d90
--- /dev/null
+++ b/puppet/hieradata/database.yaml
@@ -0,0 +1,55 @@
+# Nova
+nova::db::mysql::user: nova
+nova::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+nova::db::mysql::dbname: nova
+nova::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Glance
+glance::db::mysql::user: glance
+glance::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+glance::db::mysql::dbname: glance
+glance::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Keystone
+keystone::db::mysql::user: keystone
+keystone::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+keystone::db::mysql::dbname: keystone
+keystone::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Neutron
+neutron::db::mysql::user: neutron
+neutron::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+neutron::db::mysql::dbname: ovs_neutron
+neutron::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Cinder
+cinder::db::mysql::user: cinder
+cinder::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+cinder::db::mysql::dbname: cinder
+cinder::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Heat
+heat::db::mysql::user: heat
+heat::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+heat::db::mysql::dbname: heat
+heat::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
+
+# Ceilometer
+ceilometer::db::mysql::user: ceilometer
+ceilometer::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+ceilometer::db::mysql::dbname: ceilometer
+ceilometer::db::mysql::allowed_hosts:
+  - '%'
+  - "%{hiera('mysql_bind_host')}"
diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
index 59a8b1cf..d4a0e81d 100644
--- a/puppet/hieradata/object.yaml
+++ b/puppet/hieradata/object.yaml
@@ -1,4 +1,7 @@
 # Hiera data for swift storage nodes
+swift::storage::all::incoming_chmod: 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r'
+swift::storage::all::outgoing_chmod: 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r'
+
 swift::storage::all::object_pipeline:
   - healthcheck
   - recon
@@ -14,3 +17,5 @@ swift::proxy::keystone::operator_roles:
   - admin
   - swiftoperator
   - ResellerAdmin
+
+object_classes: []
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