diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-20 13:38:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-20 13:38:18 +0000 |
| commit | 484e45d3cccd8e964a928420a0f91751dbb5880a (patch) | |
| tree | 664802acdb8e9667e6e6026e7351c8c0b1aea922 /manifests | |
| parent | bca4febaf683a56e95ae27a3e6ad1d5995d455c8 (diff) | |
| parent | 0ea2d528ce7dce6e99eccf46cccb923c961727d1 (diff) | |
Merge "Move nova::placement to common nova manifest"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/nova.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/nova/placement.pp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index dae627c..fe1e6a6 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -110,6 +110,7 @@ class tripleo::profile::base::nova ( } if $step >= 4 { + include ::nova::placement if $manage_migration { class { '::nova::migration::libvirt': configure_libvirt => $libvirt_enabled, diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp index 7edd4e8..aa8c3c7 100644 --- a/manifests/profile/base/nova/placement.pp +++ b/manifests/profile/base/nova/placement.pp @@ -86,8 +86,6 @@ class tripleo::profile::base::nova::placement ( } if $step >= 4 { - include ::nova::placement - class { '::nova::wsgi::apache_placement': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, |