openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Ensure compute nodes use internalURL as catalog_info"

Browse Source
This commit is contained in:
Jenkins 2015-07-20 11:27:18 +00:00 committed by Gerrit Code Review
commit a38319dde5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/hieradata/compute.yaml
View File

@ -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: []

1
puppet/manifests/overcloud_compute.pp
View File

@ -44,6 +44,7 @@ exec { 'libvirt-default-net-destroy':
}
include ::nova
include ::nova::config
include ::nova::compute
nova_config {