aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
AgeCommit message (Collapse)AuthorFilesLines
2017-06-14Merge "Docker service for Cinder Volume"Jenkins1-0/+1
2017-06-14Merge "Docker services for Cinder Backup"Jenkins1-0/+1
2017-06-14Merge "Docker services for Cinder Api and Scheduler"Jenkins1-0/+2
2017-06-14Merge "Containerize multipathd"Jenkins1-0/+1
2017-06-14Merge "Move iscsid to a container"Jenkins1-0/+1
2017-06-13Unblock CI by reverting to non-containerized HAProxyJiri Stransky1-1/+0
In change I90253412a5e2cd8e56e74cce3548064c06d022b1 we merged containerized HAProxy setup, but because of a typo in resource registry, CI kept using the non-containerized variant and it went unnoticed that the containerized HAProxy doesn't work yet. We merged a resource registry fix in Ibcbacff16c3561b75e29b48270d60b60c1eb1083 and it brought down the CI, which now used the non-working HAProxy. After putting in the missing haproxy container image to tripleo-common in I41c1064bbf5f26c8819de6d241dd0903add1bbaa we got further, but the CI still fails on HAProxy related problem, so we should revert back to using non-containerized HAProxy for the time being. Change-Id: If73bf28288de10812f430619115814494618860f Closes-Bug: #1697645
2017-06-12Merge "Fix typo in haproxy docker mapping"Jenkins1-1/+1
2017-06-12Docker service for Cinder VolumeDan Prince1-0/+1
Adds docker service for Cinder Volume Co-Authored-By: Jon Bernard <jobernar@redhat.com> Depends-On: Ic1585bae27c318bd6bafc287e905f2ed250cce0f Partial-bug: #1668920 Change-Id: Ifadb007897f3455b90de6800751a0d08991ebca2
2017-06-12Docker services for Cinder BackupDan Prince1-0/+1
Adds docker services for Cinder Backup Co-Authored-By: Gorka Eguileor <geguileo@redhat.com> Co-Authored-By: Jon Bernard <jobernar@redhat.com> Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Alan Bishop <abishop@redhat.com> Partial-bug: #1668920 Change-Id: I26fc31e59b28da017f0b028b74bde40aaac53ad5
2017-06-12Docker services for Cinder Api and SchedulerDan Prince1-0/+2
Adds docker services for Cinder API and Scheduler. Co-Authored-By: Gorka Eguileor <geguileo@redhat.com> Co-Authored-By: Jon Bernard <jobernar@redhat.com> Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Alan Bishop <abishop@redhat.com> Depends-On: Ic1585bae27c318bd6bafc287e905f2ed250cce0f Change-Id: I5cff9587626a3b2a147e03146d5268242d1c9658 Partial-bug: #1668920
2017-06-12Containerize multipathdDan Prince1-0/+1
Co-Authored-By: Jon Bernard <jobernar@redhat.com> Depends-On: I486de8b6ab2f4235bb4a21c3650f6b9e52a83b80 Change-Id: I6cf70fa05ad1c8aa6d9f837ddcd370eb26e45f97
2017-06-12Move iscsid to a containerDan Prince1-0/+1
This configures iscsid so that it runs as a container on relevant roles (undercloud, controller, compute, and volume). When the iscsid docker service is provision it will also run an ansible snippet that disables the iscsid.socket on the host OS thus disabling the hosts systemd from auto-starting iscsid as it normally does. Co-Authored-By: Jon Bernard <jobernar@redhat.com> Change-Id: I2ea741ad978f166e199d47ed1b52369e9b031f1f
2017-06-08Merge "Containerize Horizon"Jenkins1-0/+1
2017-06-08Fix typo in haproxy docker mappingMichele Baldessari1-1/+1
It is 'HAproxy' and not 'HAProxy'. This needs fixing so that the proper service is instantiated when a role includes the HAproxy service. Change-Id: Ibcbacff16c3561b75e29b48270d60b60c1eb1083
2017-06-06Merge "Containerize HAProxy for the non-ha case"Jenkins1-0/+1
2017-06-06Containerize HAProxy for the non-ha caseDamien Ciabrini1-0/+1
This change implements an initial container for haproxy in the non-HA case (aka when the container is not spawn by pacemaker). We tested this using a stock kolla haproxy container image and we were able to get haproxy running on a container with net=host correctly. Change-Id: I90253412a5e2cd8e56e74cce3548064c06d022b1 Co-Authored-By: Michele Baldessari <michele@acksyn.org> Depends-on: I51c482b70731f15fee4025bbce14e46a49a49938 Closes-Bug: #1668936
2017-05-26Add sshd service to containerized compute roleOliver Walsh1-0/+1
This adds the sshd puppet service to the containerized compute role All other roles already include this service from the defaults roles data, it is only missing from the compute role. As the sshd service runs on the docker host, this must remain as a traditional puppet service. NB the sshd puppet service does not enable sshd, it just enables the management of the sshd config via t-h-t/puppet. Closes-bug: #1693837 Change-Id: I86ff749245ac791e870528ad4b410f3c1fd812e0
2017-05-20Merge "Comment parameters for registry in docker.yaml"Jenkins1-4/+4
2017-05-19Merge "Add containerized neutron-metadata agent"Jenkins1-0/+1
2017-05-18Add containerized neutron-metadata agentBrent Eagles1-0/+1
This patch adds support for running the neutron metadata agent in a container. Change-Id: I53c62516c95d62f5ced70818d4eb4c2c341df0d7 Partial-Bug: #1668922
2017-05-18Comment parameters for registry in docker.yamlSteven Hardy1-4/+4
These duplicate the defaults in puppet/services/docker.yaml and break things if you include an environment file (e.g that generated by quickstart containers-default-parameters.yaml) before the docker.yaml. Instead it's probably more helpful to include the commented lines showing how to enable use of a local docker registry. Change-Id: I3896fa2ea7caa603186f0af04f6d8382d50dd97a Closes-Bug: #1691524
2017-05-17Containerize HorizonRadomir Dopieralski1-0/+1
Adds a service definition for Horizon running inside a docker container. Co-Authored-By: Martin André <m.andre@redhat.com> Closes-Bug: #1668926 Depends-On: I677ad57672215f6afe918e13b28c9ce2e1de5a81 Change-Id: I29f18722f4da48dab18f9e5c51b01fba42316734
2017-05-16Containerize Ceilometer AgentsPradeep Kilambi1-0/+4
Depends-on: I30ba93f76171e5993b5f0e1d7f1f5533acb25740 Closes-bug: #1668925 Change-Id: I3cb61d2d8765f9c2601bb00c4bfa24162883b96a
2017-04-21Containerize Redis servicePradeep Kilambi1-0/+1
Closes-bug: #1668919 Change-Id: Ie750caa34c6fa22ca6eae6834b9ca20e15d97f7f
2017-03-17Containerize panko api serviceFlavio Percoco1-1/+1
Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Closes-bug: #1668918 Change-Id: Ie1ebd25965bd2dbad2a22161da0022bad0b9e554
2017-03-13Containerize gnocchi servicesPradeep Kilambi1-0/+3
Closes-bug: #1668928 Change-Id: I291df31be97c3d55cddb3924482aa5976a79c2b1
2017-03-13Merge "Containerize Aodh alarm services"Jenkins1-0/+5
2017-03-13Merge "Move zaqar into services-docker"Jenkins1-2/+0
2017-03-10Merge "Move mistral into services-docker"Jenkins1-3/+0
2017-03-10Merge "Move ironic into services-docker"Jenkins1-4/+0
2017-03-10Containerize Aodh alarm servicesPradeep Kilambi1-0/+5
Closes-bug: #1668930 Change-Id: If5dff4388b255373083e164a74aaacd529a94111
2017-03-08Move zaqar into services-dockerDan Prince1-2/+0
This patch moves enabling Zaqar docker services into a separate environment in the environments/services-docker directory. Change-Id: I6755eb7ae2abb2b9c8b213ff6fd21b0392353ef5
2017-03-08Move mistral into services-dockerDan Prince1-3/+0
This patch moves enabling Mistral docker services into a separate environment in the environments/services-docker directory. Change-Id: I8b484532de5f5d61fc0240defbc5fc27789a1279
2017-03-08Move ironic into services-dockerDan Prince1-4/+0
This patch moves enabling Ironic docker services into a separate environment in the environments/services-docker directory. Change-Id: I236de47d422b3563a0192359f2327610fc1714ca
2017-03-08Enable Docker service for Compute roleMartin André1-0/+3
A recent commit [1] change how docker is installed and configured on the overcloud nodes, from a cloud-init script to a proper puppet profile in puppet-tripleo but forgot to enable the docker service on the compute nodes. [1] Ia50169819cb959025866348b11337728f8ed5c9e Change-Id: I202723d0e48f110e5b0dbfe3dcf6646da9f37948
2017-03-06Enable composable upgrades for docker service templatesSteven Hardy1-1/+6
This aligns the docker based services with the new composable upgrades architecture we landed for ocata, and does a first-pass adding upgrade_tasks for the services (these may change, atm we only disable the service on the host). To run the upgrade workflow you basically do two steps: openstack overcloud deploy --templates \ -e environments/major-upgrade-composable-steps-docker.yaml This will run the ansible upgrade steps we define via upgrade_tasks then run the normal docker PostDeploySteps to bring up the containers. For the puppet workflow there's then an operator driven step where compute nodes (and potentially storage nodes) are upgrades in batches and finally you do: openstack overcloud deploy --templates \ -e environments/major-upgrade-converge-docker.yaml In the puppet case this re-applies puppet to unpin the nova RPC API so I guess it'll restart the nova containers this affects but otherwise will be a no-op (we also disable the ansible steps at this point. Depends-On: I9057d47eea15c8ba92ca34717b6b5965d4425ab1 Change-Id: Ia50169819cb959025866348b11337728f8ed5c9e
2017-03-01Containerize neutron-l3 agentJohn Trowbridge1-0/+1
This allows to run a containerized neutron on the overcloud. Co-Authored-By: Martin André <m.andre@redhat.com> Depends-On: Iaf6536b1c4d0b2b118af92295136378cdfeee9d1 Change-Id: I86a12248d4f28f4dbe7708be928bcd8a45968d01
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