summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2015-09-21 14:46:24 -0400
committerEmilien Macchi <emilien@redhat.com>2015-10-19 10:35:41 -0400
commitc66c5c6ff8346963940b3f5623c7cf5d5fb9df61 (patch)
tree077c2b28a6855406f74dee6149220a4bf1f41820
parent0f2bf59910639c62442aa3a1266ea4e67d76d25a (diff)
nova: set catalog_info to InternalURL
In nova.conf, set cinder/catalog_info to 'volumev2:cinderv2:internalURL' instead of 'volumev2:cinderv2:publicURL'. So Nova will use internal Cinder endpoint to reach volume API by using internal network. Depends-On: Id9e579ca31364d5207d0c1b892d0f7aa7f20f7a8 Change-Id: Ia34f0fe59f662c3ad29ca0178c01ef1570759d57
-rw-r--r--puppet/hieradata/common.yaml2
-rw-r--r--puppet/hieradata/compute.yaml4
2 files changed, 2 insertions, 4 deletions
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: []