aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-10 16:58:56 +0000
committerGerrit Code Review <review@openstack.org>2017-03-10 16:58:56 +0000
commitc3fd3147e4340dcd1cddbf32bdcfc31d6e907e5b (patch)
tree0eef2b7319dcc65c8f89a65026562acf307ef0f6
parentab83e7731c78d44b05243d6242d026a97f4e170a (diff)
parentc28f76c4bae8612eaa6b16f9f684f85a3dfaaa15 (diff)
Merge "Move ironic into services-docker"
-rw-r--r--environments/docker.yaml4
-rw-r--r--environments/services-docker/ironic.yaml5
2 files changed, 5 insertions, 4 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 8a977f26..01874fae 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -20,10 +20,6 @@ resource_registry:
OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
# FIXME: these need to go into a environments/services-docker dir?
- OS::TripleO::Services::NovaIronic: ../docker/services/nova-ironic.yaml
- OS::TripleO::Services::IronicApi: ../docker/services/ironic-api.yaml
- OS::TripleO::Services::IronicConductor: ../docker/services/ironic-conductor.yaml
- OS::TripleO::Services::IronicPxe: ../docker/services/ironic-pxe.yaml
OS::TripleO::Services::NeutronServer: ../docker/services/neutron-api.yaml
OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
diff --git a/environments/services-docker/ironic.yaml b/environments/services-docker/ironic.yaml
new file mode 100644
index 00000000..e927ecb3
--- /dev/null
+++ b/environments/services-docker/ironic.yaml
@@ -0,0 +1,5 @@
+resource_registry:
+ OS::TripleO::Services::IronicApi: ../../docker/services/ironic-api.yaml
+ OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
+ OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
+ OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml