From 791fbe5ab30e56fed06a6ccd8969717b34d3ec01 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 3 Aug 2017 16:01:37 +0100 Subject: [PATCH] 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) --- overcloud-resource-registry-puppet.j2.yaml | 1 + roles/Controller.yaml | 1 + roles/ControllerOpenstack.yaml | 1 + roles/IronicConductor.yaml | 1 + roles_data.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c8bdf9e469..e402f12571 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 88e4dfedd3..a6fab5555e 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 2f86d2d21d..bbc6374bb1 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 3d437aa3b9..44d98e3d87 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 a1adc5ee2f..41802202f7 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