From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 14 Jun 2017 17:34:47 +0000 (+0000)
Subject: Merge "Add Nova Consoleauth service to containerized deployment"
X-Git-Tag: opnfv-6.0.0~539
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bf66addf38e3ed53f0058c82a984fef6d5a5e5aa;p=apex-tripleo-heat-templates.git

Merge "Add Nova Consoleauth service to containerized deployment"
---

bf66addf38e3ed53f0058c82a984fef6d5a5e5aa
diff --cc environments/docker.yaml
index f8cd7b4f,dd2e1791..da4d83a9
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@@ -18,8 -18,8 +18,9 @@@ resource_registry
    OS::TripleO::Services::NovaApi: ../docker/services/nova-api.yaml
    OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml
    OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
+   OS::TripleO::Services::NovaConsoleauth: ../docker/services/nova-consoleauth.yaml
    OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
 +  OS::TripleO::Services::NovaVncProxy: ../docker/services/nova-vnc-proxy.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