Merge "Add IronicPxe to the default controller" into stable/pike

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c8bdf9e..e402f12 100644 (file)
--- 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 88e4dfe..a6fab55 100644 (file)
--- 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 2f86d2d..bbc6374 100644 (file)
--- 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 3d437aa..44d98e3 100644 (file)
--- 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 a1adc5e..4180220 100644 (file)
--- 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