X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fdocker.yaml;h=4f5b36b44f792854b952a919b87de591d55f099f;hb=5c272e9de39ca3d06158d23b30f12107c8251d1d;hp=7c6dc407c74f94c77a2dd7fb19d756451f56fc92;hpb=43e0a3df21a7800cc670bb23388ccb42609b1b75;p=apex-tripleo-heat-templates.git

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 7c6dc407..4f5b36b4 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,10 +1,16 @@
 resource_registry:
   # Docker container with heat agents for containerized compute node.
-  OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
-  OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
-
-parameters:
-  NovaImage: atomic-image
+  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
+  OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml
+  OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
+  OS::TripleO::Services::NovaCompute: ../docker/services/nova-compute.yaml
+  # NOTE (dprince) here we set new roles to be docker enabled as we add support
+  #OS::TripleO::ComputePostDeploySteps: ../docker/post.yaml
+  # NOTE (mandre) Defining per role post deploy steps doesn't work yet
+  # Set a global PostDeploySteps that works for both containerized and
+  # non-containerized roles
+  OS::TripleO::PostDeploySteps: ../docker/post.yaml
+  OS::TripleO::Services: ../docker/services/services.yaml
 
 parameter_defaults:
   # Defaults to 'tripleoupstream'.  Specify a local docker registry
@@ -12,11 +18,13 @@ parameter_defaults:
   DockerNamespace: tripleoupstream
   # Enable local Docker registry
   DockerNamespaceIsRegistry: false
-  # Compute Node Images
-  DockerComputeImage: centos-binary-nova-compute:latest
-  DockerComputeDataImage: centos-binary-data:latest
-  DockerLibvirtImage: centos-binary-nova-libvirt:latest
-  DockerNeutronAgentImage: centos-binary-neutron-agents:latest
-  DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:latest
-  DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:latest
-  DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:latest
+  DockerAgentImage: heat-docker-agents:newton
+  # Docker containers
+  DockerNovaComputeImage: centos-binary-nova-compute:newton
+  DockerLibvirtImage: centos-binary-nova-libvirt:newton
+  DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:newton
+
+  ComputeServices:
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::ComputeNeutronOvsAgent