From 5c272e9de39ca3d06158d23b30f12107c8251d1d Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 8 Nov 2016 20:50:17 +0000 Subject: Use overcloud-full instead of atomic-image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This switches to using overcloud-full as the OS image for containerized compute. It includes the following changes: - install docker, until this change lands I1eab2a6de721c8f3c21c7df0019f2d4d1cc3775f - agent image pull has been removed. This avoids a race between docker starting and the current call to pull. This relies on "docker run" to do the initial pull and leaves open the option of some other prefetch mechanism to do the initial pull - rely on unit Conflicts= to ensure heat-docker-agents and os-collect-config do not run at the same time - tweaks to host bind mounts - removal of commands which only apply to atomic Co-Authored-By: Martin André Change-Id: I2e82634785834a877a4dbdbdcd788a9ac1c14a9d --- environments/docker.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to 'environments/docker.yaml') diff --git a/environments/docker.yaml b/environments/docker.yaml index 9b0f65f9..4f5b36b4 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -13,7 +13,6 @@ resource_registry: OS::TripleO::Services: ../docker/services/services.yaml parameter_defaults: - NovaImage: atomic-image # Defaults to 'tripleoupstream'. Specify a local docker registry # Example: 192.0.2.1:8787/tripleoupstream DockerNamespace: tripleoupstream @@ -24,8 +23,6 @@ parameter_defaults: DockerNovaComputeImage: centos-binary-nova-compute:newton DockerLibvirtImage: centos-binary-nova-libvirt:newton DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:newton - DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:newton - DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:newton ComputeServices: - OS::TripleO::Services::NovaCompute -- cgit 1.2.3-korg