diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2017-01-19 11:30:35 -0500 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2017-01-20 00:12:53 +0000 |
| commit | 0ea2d528ce7dce6e99eccf46cccb923c961727d1 (patch) | |
| tree | 70cbc92721787671e398598e02c12d4dde02b587 /manifests | |
| parent | b8e4fbe838fea2726fb2373e159e1879ddfabed8 (diff) | |
Move nova::placement to common nova manifest
nova::placement needs to be declared on more than placement api node,
because credentials are used by different services (at least
nova-compute now).
This patch moves the class to base/nova.pp, at the same step.
So compute nodes will have the credentials and will be able to use
Placement API on multinode environments.
Change-Id: Iada8e9fcccec7dbfe7ac0ec0f9ec6eac1581290e
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, |