diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-24 06:38:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-24 06:38:52 +0000 |
| commit | e39fccd99e5e6c8e5f80b05d53e0933893155f65 (patch) | |
| tree | 6cdb943d0c5425fbb1e61e3293c08ee603e60e72 | |
| parent | f00e08cbfd21a39f011a291473eaf13110847725 (diff) | |
| parent | 48f1149459ecb9f3258cd8a93aee869243e0c9ed (diff) | |
Merge "Use 'public' instead of 'nova' as default floating pool name"
| -rw-r--r-- | puppet/hieradata/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 673c7773..bb49bb90 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -18,6 +18,8 @@ nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fs nova::config::nova_config: cinder/catalog_info: value: 'volumev2:cinderv2:internalURL' + DEFAULT/default_floating_pool: + value: 'public' ceilometer::agent::auth::auth_tenant_name: 'service' diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 3cc64971..7ee4708d 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -73,6 +73,10 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf nova::notify_on_state_change: 'vm_and_task_state' nova::api::osapi_v3: true +nova::config::nova_config: + DEFAULT/default_floating_pool: + value: 'public' + # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 03f47eca..46f2641b 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -247,6 +247,7 @@ if hiera('step') >= 3 { class { '::nova' : memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'), } + include ::nova::config include ::nova::api include ::nova::cert include ::nova::conductor diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 8f6d4c60..5bd16e4c 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -567,6 +567,8 @@ if hiera('step') >= 3 { memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'), } + include ::nova::config + class { '::nova::api' : sync_db => $sync_db, manage_service => false, |