aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
AgeCommit message (Collapse)AuthorFilesLines
2017-02-24Enable docker for all rolesMartin André1-1/+1
A recent patch enabled a few containerized services on the Controller node. We need to enable docker for all the roles. Change-Id: I99fc0c2d29db3514a439b717d14367ad2252e450
2017-02-15Enable docker services in the registryDan Prince1-0/+30
This patch avoids conflicts when cherry picking docker services in our ad-hoc docker services patch series and enables them all at once. Change-Id: Ia4f7c8071d8b4f3c9a7d73173e9120eb1e79ce53
2017-02-15docker: new hybrid deployment architecture and configurationDan Prince1-14/+5
This patch implements a new docker deployment architecture that should us to install docker services in a stepwise manner alongside of baremetal puppet services. This works by using Yaql to select docker specific services (docker/services/*.yaml) vs the puppet specific ones and then applying the selected Json to relevant Heat software deployments for docker and baremetal puppet in a stepwise fashion. Additionally the new architecture leverages new composable services interfaces from Newton to allow configuration of per-service container configuration sets (directories that are bind mounted into kolla containers) by using the Kolla containers themselves. It does this by spinning up a throw away "configuration only" version of the container being configured itself, then running the puppet apply in that container and copying the generated config files into /var/lib/config-data. This avoids having to install all of the OpenStack dependency packages in the heat-agent-container itself (our previous approach) and should allow us to configure a much wider variety of container config files that would otherwise be impossible with the previous shared approach. The new approach (combined) should allow us to configure containers in both the undercloud and overcloud and incrementally add CI coverage to services as we containerize them. Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Ian Main <imain@redhat.com> Co-Authored-By: Flavio Percoco <flavio@redhat.com> Change-Id: Ibcff99f03e6751fbf3197adefd5d344178b71fc2
2016-12-19Use overcloud-full instead of atomic-imageSteve Baker1-3/+0
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
2016-12-19Introduce role-specific NodeUserData, use for dockerSteve Baker1-1/+1
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
2016-11-22Containerized Services for Composable RolesIan Main1-9/+22
This change modifies the template interface to support containers and converts the compute services to composable roles. Co-Authored-By: Dan Prince <dprince@redhat.com> Co-Authored-By: Flavio Percoco <flavio@redhat.com> Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Steve Baker <sbaker@redhat.com> Change-Id: I82fa58e19de94ec78ca242154bc6ecc592112d1b
2016-05-05Combine parameter_default fieldsRyan Hallisey1-2/+0
The paramaters field was changed to parameter_defaults everywhere. Combine both parameter_default fields. Change-Id: Ia1874463cdd6bf81be5739363e639bd11312abec
2016-04-11Always use parameter_defaults in environment filesJiri Stransky1-1/+1
In the environments/ subdirectory of tripleo-heat-templates, we mostly use parameter_defaults, but some of the environment files still use parameters. This can lead to confusing behavior with respect to parameter priority when passing environment files to deploy/update commands. Users might expect that subsequent environment files take priority over preceding ones, but that might not be the case if the preceding environment files use `parameters`, while the subsequent ones use `parameter_defaults`. This commit switches all `parameters:` uses in environments/ subdirectory to `parameter_defaults:`. Change-Id: Ie4c03c7e7f5a5004a0384d35817135f357e9719b Closes-Bug: #1567837
2016-03-11Merge "Remove unused Neutron Agents container"Jenkins1-1/+0
2016-03-09Remove unused Neutron Agents containerRyan Hallisey1-1/+0
The Neutron Agents is currently not used. Refactor the heat templates to accommodate for this change. Change-Id: Ice3c5ce723fa16cfb66c2b0afbe51d7b282c3210
2016-03-04Parameterize the heat-docker-agents imageRyan Hallisey1-0/+1
Heat docker agents needs to be parameterized so that we can change the tag from the environment file. Change-Id: I352fd0fdf982056de23285e366efe55ca3aaff1b Co-authored-by: Jeff Peeler <jpeeler@redhat.com>
2016-02-12Minor fixes to allow local docker registry usageJeff Peeler1-1/+1
Changed the heat-docker-agents namespace to use the namespacing specified in the environment file, which reduces modifications required on the user when using a local registry. Changed the start agents script to handle using a local registry both with a namespace and without. Change-Id: I16cc96b7ecddeeda07de45f50ffc6a880dabbba6
2016-01-04Network Isolation support for containerized computeRyan Hallisey1-0/+22
The template will all neutron-agents to be configured so that it can run the network isolation templates on the containerized compute node. Co-Authored-By: Dan Prince <dpince@redhat.com> Change-Id: I7837ed7ed3e807ec5c1276904893695918bef293