summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-07-16 23:45:20 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-07-17 00:39:13 +0200
commitfa363535afe9701a5dca62db1eb69cfd37124da0 (patch)
tree11b05633f3729be468fdf2769d7db8462a4925fb /puppet
parentb9a1f31df3d4a33b1d317ad0f970b88adff17f5a (diff)
Ensure compute nodes use internalURL as catalog_info
By default Nova will get the publicURL instead, which is not reachable by the compute nodes. Change-Id: I57b6a7a7eddb0ffaf6d2d152d932f390c48f908e
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/compute.yaml4
-rw-r--r--puppet/manifests/overcloud_compute.pp1
2 files changed, 5 insertions, 0 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 63a3473d..673c7773 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,6 +15,10 @@ 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: [] \ No newline at end of file
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 67a73dda..f7dd61d6 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -44,6 +44,7 @@ exec { 'libvirt-default-net-destroy':
}
include ::nova
+include ::nova::config
include ::nova::compute
nova_config {