aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-10 14:28:29 +0000
committerGerrit Code Review <review@openstack.org>2017-10-10 14:28:29 +0000
commit94e8238d6b61811d705b653ffb36d1aea624d015 (patch)
tree78f403e55355f7a3a2084d3a4ddc5bba069b5276
parentaf040d1e9418e6f266cfe8e2d1111ac80aaa7b94 (diff)
parent791fbe5ab30e56fed06a6ccd8969717b34d3ec01 (diff)
Merge "Add IronicPxe to the default controller" into stable/pike
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
-rw-r--r--roles/Controller.yaml1
-rw-r--r--roles/ControllerOpenstack.yaml1
-rw-r--r--roles/IronicConductor.yaml1
-rw-r--r--roles_data.yaml1
5 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c8bdf9e..e402f12 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 88e4dfe..a6fab55 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 2f86d2d..bbc6374 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 3d437aa..44d98e3 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 a1adc5e..4180220 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