summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2016-12-08 14:44:35 +1300
committerFlavio Percoco <flaper87@gmail.com>2016-12-19 18:13:57 +0100
commitd5cd18d3c5e1a54cb15be39e421f98fd01e1a99c (patch)
tree1dca58f2f35c0ccfc7c6cf04e0d3f060b7f82d32 /environments
parente6bc52058174d4dd5e35f075f20c58c164206d98 (diff)
Introduce role-specific NodeUserData, use for docker
Currently when the docker environments are invoked, every node has the boot script run which replaces os-collect-config with the heat-agents container. This should only be happening on Compute nodes currently, and each role will be converted to heat-agents one at a time. This change implements a role-specific NodeUserData resource and uses that mechanism to run docker/firstboot/install_docker_agents.yaml only on Compute nodes. Change-Id: Id81811dbcaf0e661c3980aa25f3ca80db5ef0954
Diffstat (limited to 'environments')
-rw-r--r--environments/docker.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 0755c61f..9b0f65f9 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,6 +1,6 @@
resource_registry:
# Docker container with heat agents for containerized compute node.
- OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
+ 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