6 files changed, 11 insertions, 13 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6db9e955..98c7ba00 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -913,7 +913,9 @@ resources:
         ceilometer_dsn:
           list_join:
             - ''
-            - - 'mysql://ceilometer:unset@'
+            - - 'mysql://ceilometer:'
+              - {get_param: CeilometerPassword}
+              - '@'
               - {get_param: MysqlVirtualIP}
               - '/ceilometer'
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 4a872d57..030f661d 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -29,3 +29,5 @@ 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 d7c1f879..4a94c237 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,10 +15,6 @@ 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'
-
 ceilometer::agent::auth::auth_tenant_name: 'service'
 
 compute_classes: []
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 6db32624..bc135260 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -76,6 +76,9 @@ 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
 
@@ -93,6 +96,9 @@ pacemaker::resource_defaults::defaults:
 # horizon
 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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index c3302362..777af228 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -461,10 +461,8 @@ if hiera('step') >= 3 {
     $_profile_support = 'None'
   }
   $neutron_options   = {'profile_support' => $_profile_support }
-  $vhost_params = { add_listen => false }
   class { 'horizon':
     cache_server_ip    => hiera('memcache_node_ips', '127.0.0.1'),
-    vhost_extra_params => $vhost_params,
     neutron_options    => $neutron_options,
   }
 
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index eeac5834..0b082e6c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -893,14 +893,8 @@ if hiera('step') >= 3 {
     $_profile_support = 'None'
   }
   $neutron_options   = {'profile_support' => $_profile_support }
-  $vhost_params = {
-    add_listen => false,
-    priority   => 10,
-  }
   class { 'horizon':
     cache_server_ip    => hiera('memcache_node_ips', '127.0.0.1'),
-    vhost_extra_params => $vhost_params,
-    server_aliases     => $::hostname,
     neutron_options    => $neutron_options,
   }