aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-23 00:06:15 +0000
committerGerrit Code Review <review@openstack.org>2015-09-23 00:06:15 +0000
commit400028a542e58b8d729d9f2880df59ef1fb225cc (patch)
treea22b9e579b07a475e503b5c8ccfcb46b99a6d87a /puppet
parent1730d95acdbee7c7bbcfe1eba8a48ef2b0cc1476 (diff)
parentbf53ea5f95989a89cdbb7128f3d5cf56eae681de (diff)
Merge "Remove default_floating_pool in compute.yaml"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/compute.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 7d94e163..d7c1f879 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,7 +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::api::default_floating_pool: 'public'
nova::config::nova_config:
cinder/catalog_info:
value: 'volumev2:cinderv2:internalURL'