summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-08 15:26:15 -0500
committerDan Prince <dprince@redhat.com>2017-03-08 15:26:15 -0500
commitc28f76c4bae8612eaa6b16f9f684f85a3dfaaa15 (patch)
tree2b242aac5541e50bc287bdcd42b8cbbb084b4a0f
parenta1b3e2ee756b2957118c65cab83814461cce1b07 (diff)
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
-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 3696f908..4062bc8c 100644
--- 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
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