summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-05-25 18:24:11 +0200
committerBogdan Dobrelya <bdobreli@redhat.com>2017-05-25 18:31:00 +0200
commit359fcdf8492134bfc133a5dc92422b62e954212d (patch)
tree6e13cb4c66b15c9470830b778ee7d27f953f602a /environments
parent2cd3c412bf850c087564bcaf652d2c3dce77cab3 (diff)
Align optional services with optional services-docker
Add missing optional services for docker, if present in non-docker optional services, and vice versa. Fix issues with non containerized Mongo resources are missing when deploying optional containerized zaqar service. Add non containerized Ironix-Pxe resources to the optional Ironic services, as it is done for the containerized Ironic. Change-Id: I56675e015fa4bbd6d9809dbf7c21453939321410 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'environments')
-rw-r--r--environments/services-docker/zaqar.yaml1
-rw-r--r--environments/services/ironic.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/services-docker/zaqar.yaml b/environments/services-docker/zaqar.yaml
index ca0b3b15..08033d91 100644
--- a/environments/services-docker/zaqar.yaml
+++ b/environments/services-docker/zaqar.yaml
@@ -1,2 +1,3 @@
resource_registry:
OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml
+ OS::TripleO::Services::MongoDb: ../../docker/services/database/mongodb.yaml
diff --git a/environments/services/ironic.yaml b/environments/services/ironic.yaml
index 8359f4a7..b1317382 100644
--- a/environments/services/ironic.yaml
+++ b/environments/services/ironic.yaml
@@ -1,4 +1,5 @@
resource_registry:
OS::TripleO::Services::IronicApi: ../../puppet/services/ironic-api.yaml
OS::TripleO::Services::IronicConductor: ../../puppet/services/ironic-conductor.yaml
+ OS::TripleO::Services::IronicPxe: ../../puppet/services/ironic-pxe.yaml
OS::TripleO::Services::NovaIronic: ../../puppet/services/nova-ironic.yaml