summaryrefslogtreecommitdiffstats
path: root/roles
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 /roles
parentaf040d1e9418e6f266cfe8e2d1111ac80aaa7b94 (diff)
parent791fbe5ab30e56fed06a6ccd8969717b34d3ec01 (diff)
Merge "Add IronicPxe to the default controller" into stable/pike
Diffstat (limited to 'roles')
-rw-r--r--roles/Controller.yaml1
-rw-r--r--roles/ControllerOpenstack.yaml1
-rw-r--r--roles/IronicConductor.yaml1
3 files changed, 3 insertions, 0 deletions
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