aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-21 21:40:29 +0000
committerGerrit Code Review <review@openstack.org>2015-10-21 21:40:29 +0000
commitd2a0e1c38041cb784404542c7efa4d23c6dd3003 (patch)
tree5167421760f3348191f007b9f7a40af6e6868752 /puppet
parent9a7c55e4a71b46cb40a9288eb86e477d0a8b029c (diff)
parent823c7e100ce59d59e907f62caeb917f75670224e (diff)
Merge "controller/ceilometer: use internalURL for os endpoint type"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 7972a564..7b46e853 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -75,6 +75,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