5c272e9de3
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é <m.andre@redhat.com> Change-Id: I2e82634785834a877a4dbdbdcd788a9ac1c14a9d
31 lines
1.4 KiB
YAML
31 lines
1.4 KiB
YAML
resource_registry:
|
|
# Docker container with heat agents for containerized compute node.
|
|
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
|
|
# Example: 192.0.2.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
|
|
- OS::TripleO::Services::NovaLibvirt
|
|
- OS::TripleO::Services::ComputeNeutronOvsAgent
|