diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-26 08:49:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-26 08:49:02 +0000 |
| commit | 683ca0aa1addf544c8992a08a66e069010c3d1a7 (patch) | |
| tree | 790246382a24210c14685a22944c081e11b281a9 | |
| parent | 1452f9ea829f74b91947910361484963cee74cb0 (diff) | |
| parent | 359fcdf8492134bfc133a5dc92422b62e954212d (diff) | |
Merge "Align optional services with optional services-docker"
| -rw-r--r-- | environments/services-docker/zaqar.yaml | 1 | ||||
| -rw-r--r-- | environments/services/ironic.yaml | 1 |
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 |