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 /puppet/manifests | |
| parent | f00e08cbfd21a39f011a291473eaf13110847725 (diff) | |
| parent | 48f1149459ecb9f3258cd8a93aee869243e0c9ed (diff) | |
Merge "Use 'public' instead of 'nova' as default floating pool name"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
2 files changed, 3 insertions, 0 deletions
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, |