diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-02 15:14:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-02 15:14:21 +0000 |
| commit | ffd4443a268cb9a7615b8a3531efc452e678c3e7 (patch) | |
| tree | db2eae3cd6a89c5cfe2837c7456c4c23b2f5e730 /environments | |
| parent | 9ba58e005cf7c0daff6e7e8c622975f4005315ff (diff) | |
| parent | 5c272e9de39ca3d06158d23b30f12107c8251d1d (diff) | |
Merge "Use overcloud-full instead of atomic-image"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
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 |