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>
This commit is contained in:
Bogdan Dobrelya 2017-05-25 18:24:11 +02:00
parent 2cd3c412bf
commit 359fcdf849
2 changed files with 2 additions and 0 deletions

View File

@ -1,2 +1,3 @@
resource_registry: resource_registry:
OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml
OS::TripleO::Services::MongoDb: ../../docker/services/database/mongodb.yaml

View File

@ -1,4 +1,5 @@
resource_registry: resource_registry:
OS::TripleO::Services::IronicApi: ../../puppet/services/ironic-api.yaml OS::TripleO::Services::IronicApi: ../../puppet/services/ironic-api.yaml
OS::TripleO::Services::IronicConductor: ../../puppet/services/ironic-conductor.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 OS::TripleO::Services::NovaIronic: ../../puppet/services/nova-ironic.yaml