3 files changed, 27 insertions, 22 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 34965959..65cf9577 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -17,6 +17,7 @@ nova::network::neutron::neutron_username: 'neutron'
 nova::network::neutron::dhcp_domain: ''
 
 neutron::allow_overlapping_ips: true
+neutron::server::project_name: 'service'
 
 kernel_modules:
   nf_conntrack: {}
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 1e888f39..5a46fc2b 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -1,5 +1,6 @@
 # Hiera data here applies to all compute nodes
 
+nova::host: "%{::fqdn}"
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::notification_driver: messagingv2
 nova::compute::enabled: true
@@ -22,4 +23,6 @@ nova::compute::reserved_host_memory: 2048
 ceilometer::agent::auth::auth_tenant_name: 'service'
 ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 
+neutron::host: "%{::fqdn}"
+
 compute_classes: []
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 321ae804..3ad0748e 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -1,7 +1,6 @@
 # Hiera data here applies to all controller nodes
 
 nova::api::enabled: true
-nova::conductor::enabled: true
 nova::consoleauth::enabled: true
 nova::vncproxy::enabled: true
 nova::scheduler::enabled: true
@@ -31,6 +30,7 @@ rabbitmq_kernel_variables:
 rabbitmq_config_variables:
   tcp_listen_options: '[binary, {packet, raw}, {reuseaddr, true}, {backlog, 128}, {nodelay, true}, {exit_on_close, false}, {keepalive, true}]'
   cluster_partition_handling: 'pause_minority'
+  loopback_users: '[]'
 
 mongodb::server::replset: tripleo
 mongodb::server::journal: false
@@ -114,6 +114,7 @@ neutron::server::sync_db: true
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::default_floating_pool: 'public'
 nova::api::sync_db_api: true
+nova::api::enable_proxy_headers_parsing: true
 nova::scheduler::filter::ram_allocation_ratio: '1.0'
 nova::cron::archive_deleted_rows::hour: '*/12'
 nova::cron::archive_deleted_rows::destination: '/dev/null'
@@ -126,7 +127,6 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
 cinder::cron::db_purge::destination: '/dev/null'
 cinder::host: hostgroup
-cinder_user_enabled_backends: []
 
 # TODO(jaosorior): Move to cinder profile once cinder is moved as a composable
 # service.
@@ -143,6 +143,7 @@ heat::cron::purge_deleted::destination: '/dev/null'
 heat::keystone::domain::domain_name: 'heat_stack'
 heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
 heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
+heat::auth_plugin: 'password'
 
 # pacemaker
 pacemaker::corosync::cluster_name: 'tripleo_cluster'
@@ -163,26 +164,26 @@ horizon::vhost_extra_params:
 mysql::server::manage_config_file: true
 
 
-tripleo::loadbalancer::keystone_admin: true
-tripleo::loadbalancer::keystone_public: true
-tripleo::loadbalancer::neutron: true
-tripleo::loadbalancer::cinder: true
-tripleo::loadbalancer::glance_api: true
-tripleo::loadbalancer::glance_registry: true
-tripleo::loadbalancer::nova_osapi: true
-tripleo::loadbalancer::nova_metadata: true
-tripleo::loadbalancer::nova_novncproxy: true
-tripleo::loadbalancer::mysql: true
-tripleo::loadbalancer::redis: true
-tripleo::loadbalancer::sahara: true
-tripleo::loadbalancer::swift_proxy_server: true
-tripleo::loadbalancer::ceilometer: true
-tripleo::loadbalancer::aodh: true
-tripleo::loadbalancer::gnocchi: true
-tripleo::loadbalancer::heat_api: true
-tripleo::loadbalancer::heat_cloudwatch: true
-tripleo::loadbalancer::heat_cfn: true
-tripleo::loadbalancer::horizon: true
+tripleo::haproxy::keystone_admin: true
+tripleo::haproxy::keystone_public: true
+tripleo::haproxy::neutron: true
+tripleo::haproxy::cinder: true
+tripleo::haproxy::glance_api: true
+tripleo::haproxy::glance_registry: true
+tripleo::haproxy::nova_osapi: true
+tripleo::haproxy::nova_metadata: true
+tripleo::haproxy::nova_novncproxy: true
+tripleo::haproxy::mysql: true
+tripleo::haproxy::redis: true
+tripleo::haproxy::sahara: true
+tripleo::haproxy::swift_proxy_server: true
+tripleo::haproxy::ceilometer: true
+tripleo::haproxy::aodh: true
+tripleo::haproxy::gnocchi: true
+tripleo::haproxy::heat_api: true
+tripleo::haproxy::heat_cloudwatch: true
+tripleo::haproxy::heat_cfn: true
+tripleo::haproxy::horizon: true
 
 controller_classes: []
 # firewall