diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 03:04:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 03:04:13 +0000 |
| commit | 4fd12f1d18eaee79a299102df370281acf4dfac3 (patch) | |
| tree | 3658ea45be68e41616b7c91679fed68bb038b451 /environments | |
| parent | 1c486d57a89ed37b435bd344175301caaa32a489 (diff) | |
| parent | ad2ea290bed17bff9b53ac225d3604ed642ee8bc (diff) | |
Merge "docker: new hybrid deployment architecture and configuration"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 4f5b36b4..37612b07 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -1,28 +1,19 @@ resource_registry: - # Docker container with heat agents for containerized compute node. - OS::TripleO::Compute::NodeUserData: ../docker/firstboot/install_docker_agents.yaml + OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml + + #NOTE (dprince) add roles to be docker enabled as we support them 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 - # Example: 192.0.2.1:8787/tripleoupstream + # Example: 192.168.24.1:8787/tripleoupstream DockerNamespace: tripleoupstream - # Enable local Docker registry DockerNamespaceIsRegistry: false - 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 |