Move ironic into services-docker

This patch moves enabling Ironic docker services into
a separate environment in the environments/services-docker
directory.

Change-Id: I236de47d422b3563a0192359f2327610fc1714ca

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 3696f90..4062bc8 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -18,10 +18,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 (file)
index 0000000..e927ecb
--- /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