diff options
| author |   Derek Higgins <derekh@redhat.com> | 2017-08-03 16:01:37 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-10-10 01:54:02 +0000 |
| commit | 791fbe5ab30e56fed06a6ccd8969717b34d3ec01 (patch) | |
| tree | 5bf5deb0019c7432094f92cd5e89773ff2f10213 | |
| parent | 0f0da45d9a5f4c13cbca45e9083ef3af5b748803 (diff) | |
Add IronicPxe to the default controller
It doesn't exist in the non containerized openstack so leave it
stubbed out by default.
Closes-Bug: #1721212
Change-Id: I5fcb1f0b9958ac90f034a12f1ee733dae6571f9c
(cherry picked from commit a850d8059fbc1c36efb18773e40bb600e5da5005)
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 | ||||
| -rw-r--r-- | roles/Controller.yaml | 1 | ||||
| -rw-r--r-- | roles/ControllerOpenstack.yaml | 1 | ||||
| -rw-r--r-- | roles/IronicConductor.yaml | 1 | ||||
| -rw-r--r-- | roles_data.yaml | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c8bdf9e4..e402f125 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -258,6 +258,7 @@ resource_registry: OS::TripleO::Services::IronicApi: OS::Heat::None OS::TripleO::Services::IronicConductor: OS::Heat::None OS::TripleO::Services::IronicInspector: OS::Heat::None + OS::TripleO::Services::IronicPxe: OS::Heat::None OS::TripleO::Services::NovaIronic: OS::Heat::None OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 88e4dfed..a6fab555 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -75,6 +75,7 @@ - OS::TripleO::Services::Horizon - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Kernel diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 2f86d2d2..bbc6374b 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -58,6 +58,7 @@ - OS::TripleO::Services::Horizon - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Kernel diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 3d437aa3..44d98e3d 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -13,6 +13,7 @@ - OS::TripleO::Services::Docker - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::IronicConductor + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp diff --git a/roles_data.yaml b/roles_data.yaml index a1adc5ee..41802202 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -78,6 +78,7 @@ - OS::TripleO::Services::Horizon - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Kernel |