diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-20 11:27:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-20 11:27:18 +0000 |
| commit | a38319dde5d1c2b83c6a35c397e17f8c5570d8f1 (patch) | |
| tree | f3245eaafa3914871dd9cd9f2438ec59fd84b6e9 /puppet | |
| parent | 3fe8be130bea172cdeab5d20115bfa550de92f24 (diff) | |
| parent | fa363535afe9701a5dca62db1eb69cfd37124da0 (diff) | |
Merge "Ensure compute nodes use internalURL as catalog_info"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/compute.yaml | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 1 |
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 { |