aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2017-07-24Merge "Move docker_puppet_tasks calculation into services.yaml"Jenkins2-21/+14
2017-07-24Merge "Cleans up exec workaround for ODL container clustering"Jenkins1-5/+2
2017-07-24Merge "Add support for nova live/cold-migration with containers"Jenkins4-17/+140
2017-07-24Merge "Remove non-containerized pacemaker resources on upgrade"Jenkins6-10/+140
2017-07-24Move docker_puppet_tasks calculation into services.yamlSteven Hardy2-21/+14
This makes the RolesData output more accurate, and we can rework things so docker-puppet only gets run when there is a non-empty file calculated (e.g there are tasks to run). Change-Id: I8cdab3c857977c80fe2e359ab9e05740a838d66b
2017-07-24Merge "Refactor iscsi initiator-name reset into separate service"Jenkins6-17/+49
2017-07-24Merge "Support configurable Zaqar backends"Jenkins1-32/+66
2017-07-24Support configurable Zaqar backendsDan Prince1-32/+66
This patch adds parameters to configure alternative version of the Zaqar messaging and management backends. The intent is to make use of these settings in the containers undercloud to use swift/mysql backends as a default thus avoiding the dependency on MongoDB. Change-Id: Ifd6a561737184c9322192ffc9a412c77d6eac3e9 Depends-On: Ie6a56b9163950cee2c0341afa0c0ddce665f3704 Depends-On: I3598e39c0a3cdf80b96e728d9aa8a7e6505e0690
2017-07-23Add support for nova live/cold-migration with containersOliver Walsh4-17/+140
Updates hieradata for changes in https://review.openstack.org/471950. Creates a new service - NovaMigrationTarget. On baremetal this just configures live/cold-migration. On docker is includes a container running a second sshd services on an alternative port. Configures /var/lib/nova/.ssh/config and mounts in nova-compute and libvirtd containers. Change-Id: Ic4b810ff71085b73ccd08c66a3739f94e6c0c427 Implements: blueprint tripleo-cold-migration Depends-On: I6c04cebd1cf066c79c5b4335011733d32ac208dc Depends-On: I063a84a8e6da64ae3b09125cfa42e48df69adc12
2017-07-22Merge "Disable env evaluation in workflow executions"Jenkins1-0/+2
2017-07-22Merge "Make EnablePackageInstall and Debug descriptions consistent"Jenkins1-1/+1
2017-07-22Merge "Move step_config/docker_config calculation into services.yaml"Jenkins1-29/+2
2017-07-21Make EnablePackageInstall and Debug descriptions consistentBen Nemec1-1/+1
Change-Id: I3ea7c0c7ea049043668e68c6e637fd2aaf992622 Partial-Bug: 1700664
2017-07-21Cleans up exec workaround for ODL container clusteringTim Rozet1-5/+2
Now that ODL clustering is fixed to not use an exec by: https://git.opendaylight.org/gerrit/#/c/60491 We no longer need to use the workaround puppet-tripleo tag to configure clustering. Change-Id: I21c1eb2eff6d4cb855eff4a1122f55ad625d84cc Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-07-21Merge "Remove DockerNamespace references"Jenkins3-43/+5
2017-07-21Move step_config/docker_config calculation into services.yamlSteven Hardy1-29/+2
Moving these means we get a more accurate output from the overcloud RoleData output, which more closely reflects what is actually deployed. Change-Id: I154f36c1597cf4abe29ca0bfe15a54f507433fb1
2017-07-21Merge "Add nova::compute::rbd setting into nova-libvirt profile"Jenkins1-1/+3
2017-07-20Remove DockerNamespace referencesIan Main3-43/+5
This patch removes more of the DockerNamespace references as part of the cleanup/reorg of the container configuration patches. This also adds a centos-rdo environment file for use with the new interface. This file was generated with the command "openstack overcloud container image prepare" Depends-On: I729fa00175cb36b02b882d729aae5ff06d0e3fbc Depends-On: I292162d66880278de09f7acbdbf02e2312c5bb2b Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: Ice7b57c25248634240a6dd6e14e6d411e7806326
2017-07-20Merge "Add validation task in docker services"Jenkins4-0/+42
2017-07-20Disable env evaluation in workflow executionsGiulio Fidente1-0/+2
This is so that Mistral does not try to resolve the occurrences of {{ or <% as jinja/jaql in the environment data. Change-Id: Id654c336d072a6248570274401857756c6f6e706
2017-07-20Remove non-containerized pacemaker resources on upgrademarios6-10/+140
Adds upgrade_tasks to remove the pacemaker resources using the ansible-pacemaker module. Resources are disabled and removed in step2 (called only on bootstrap node) and then the cluster stop is moved to step3 The existing systemd/service call is kept but only to disable services after they are disabled/deleted from the cluster. Related-Bug: 1701485 Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com> Change-Id: Ia597d240ea5834c50a8f6c4fac0b6ed417b8535c
2017-07-19Merge "Wrap ceilometer-upgrade in boostrap_host_exec"Jenkins1-1/+5
2017-07-19Add nova::compute::rbd setting into nova-libvirt profileGiulio Fidente1-1/+3
Some of the tasks carried by nova::compute::rbd class apply to the compute service, others to the libvirt service so it needs to be included in both. Change-Id: I28557deb13b75922932cd3e86c3467a541c988d0
2017-07-18Merge "Allow modprobing from cinder-volume container"Jenkins1-0/+1
2017-07-18Merge "LVM in cinder-volume container without udev"Jenkins1-2/+8
2017-07-18Merge "Improve logs from ansible, puppet, docker-puppet.py"Jenkins2-18/+63
2017-07-18Merge "Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2"Jenkins1-28/+26
2017-07-17Refactor iscsi initiator-name reset into separate serviceOliver Walsh6-17/+49
This currently assumes nova-compute and iscsid run in the same context which isn't true for a containerized deployment Change-Id: I11232fc412adcc18087928c281ba82546388376e Depends-On: I91f1ce7625c351745dbadd84b565d55598ea5b59 Depends-On: I0cbb1081ad00b2202c9d913e0e1759c2b95612a5
2017-07-17Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2Giulio Fidente1-28/+26
We missed to parse and merge {controller,NovaCompute}ExtraConfig data in change [1]. Also fixes whitespaces handling in docker-steps.j2 and puppet-steps.j2 previously updated by [2]. 1. Id37de5864138edd5476c097a8a1f0763faeaf768 2. I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a Change-Id: Ia9983bc991eb79e479855993c1c8819ddfb52e38
2017-07-17Merge "Add role_merged_configs into workflow executions environmentxi"Jenkins1-0/+8
2017-07-15Merge "Use a single configuration file for specifying docker containers."Jenkins77-1081/+154
2017-07-14Use a single configuration file for specifying docker containers.Ian Main77-1081/+154
This removes the default container names from all the templates and uses a single environment file to specify the full container name and registry from which to pull. Also does away with most of DockerNamespace. Change-Id: Ieaedac33f0a25a352ab432cdb00b5c888be4ba27 Depends-On: Ibc108871ebc2beb1baae437105b2da1d0123ba60 Co-Authored-By: Dan Prince <dprince@redhat.com> Co-Authored-By: Steve Baker <sbaker@redhat.com>
2017-07-14Add role_merged_configs into workflow executions environmentxiGiulio Fidente1-0/+8
Merges per-role config settings into merged_config_settings which is wired into the workflow executions environment. Useful to consume role config settings from within a workflow. Change-Id: Id37de5864138edd5476c097a8a1f0763faeaf768
2017-07-14Add validation task in docker servicesJose Luis Franco Arza4-0/+42
Docker services are missing the pre-upgrade validation task in the upgrade_tasks section which verifies if the service is running before stopping it. Change-Id: Ia8c25827d0d6f34e0345c3946dfd6839a7116e04 Partial-Bug: #1704389
2017-07-14Adds network/cidr mapping into a new service propertyGiulio Fidente81-0/+397
Makes it possible to resolve network subnets within a service template; the data is transported into a new property ServiceData wired into every service which hopefully is generic enough to be extended in the future and transport more data. Data can be consumed in service templates to set config values which need to know what is the subnet where a deamon operates (for example the Ceph Public vs Cluster network). Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2
2017-07-14Improve logs from ansible, puppet, docker-puppet.pyBogdan Dobrelya2-18/+63
* Debug ansible 'puppet apply' stderr joined stdout, split by lines. * Do 'puppet apply' w/o colors, logdest syslog, and given a wanted modulepath instead of the module puppet, that can't support those options. * Bind-mount syslog socket for docker-puppet.py to pass puppet logs to host OS syslog. * Fix logging handlers for multiprocess workers in docker-puppet.py. Related-bug: #1698172 Closes-bug: #1700086 Change-Id: I84112a836e968aa5c3596a6544e0392980529963 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2017-07-13Merge "Containerize Manila Share service"Jenkins1-0/+118
2017-07-13Merge "Fix ironic-pxe startup issues"Jenkins1-7/+7
2017-07-13Merge "Add support for running crontabs in containers"Jenkins3-5/+15
2017-07-13Merge "Run rsync for Swift without xinetd"Jenkins1-4/+4
2017-07-13Merge "Add missing tags in iscsid upgrade_tasks"Jenkins1-0/+2
2017-07-12Fix ironic-pxe startup issuesDan Prince1-7/+7
This patch updates the ironic-api docker service so that it generates its config files in a unique config root. This ensures that it doesn't have config files in the httpd conf.d directory for both the API and PXE services thus causing the API container to attempt to launch both of them. This functionally fixes the Ironic API and PXE services with docker so they once again can bring up an overcloud. Change-Id: I537cd6a3337bf776ca38a279b7c130b6429eea04 Closes-bug: #1702799
2017-07-12Merge "Bind mount needed cert for haproxy for HA too"Jenkins1-12/+26
2017-07-12Containerize Manila Share serviceVictoria Martinez de la Cruz1-0/+118
Change-Id: I797eea2f7788f65411964ccb852b5707e916416f Partial-Bug: #1668922
2017-07-12Add support for running crontabs in containersOliver Walsh3-5/+15
This change enables the puppet cron resource in docker-puppet.py and adds user crontabs to the paths copied from the config containers. Only the nova crontab is configured for now. Other services will require similar changes to run their crontabs. Partial-Bug: 1701254 Change-Id: I2d1d0f0d77908a132472cf4bc475f8bd526af504 Depends-On: Ie16fb4539481a3c192cff8220a97daa4c70467fc
2017-07-12Run rsync for Swift without xinetdChristian Schwede1-4/+4
The default in non-containerized environments is to run rsync within xinetd for Red Hat-based deployments, however in an containerized environment this is not really needed. Therefore run rsync directly without being started by xinetd. Change-Id: I08abd917eba08d1192437ddf96c71b06d099a3f8
2017-07-11Allow modprobing from cinder-volume containerJiri Stransky1-0/+1
When using LVM/iSCSI backend, cinder-volume tries to modprobe configfs module. We need the modules dir bind mounted for this to succeed. Co-Authored-By: Gorka Eguileor <geguileo@redhat.com> Change-Id: I7bfeaa66915e663726acdf3458db80821fbd3d6b Closes-Bug: #1701321
2017-07-11LVM in cinder-volume container without udevJiri Stransky1-2/+8
Disabling udev usage from LVM seems to be the only observed working way of running containerized cinder-volume with local LVM backend. I didn't come across reports that not using udev would have negative impact on the functionality. Additional info at https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw Change-Id: I491795deab0c37d1bad3b50524481e0b76529667 Depends-On: I1bf395a6228dba66fa6bf9b8bcc9f3ac3d922a49 Closes-Bug: #1700982
2017-07-10Bind mount needed cert for haproxy for HA tooMartin André1-12/+26
haproxy needs the deployed SSL cert file to function when TLS is enabled. It is also required for the docker-puppet haproxy container since the haproxy puppet module uses a validate_cmd to check the generated config file is valid that fails when the required SSL cert is not present. There is no clean way to disable this feature [1] so we need to bind mount the cert into the container. This commit applies the same change that was applied in Id2df144b678769def204961236624091d4e5c457 for the non-ha case. [1] https://github.com/puppetlabs/puppetlabs-haproxy/blob/4753ea5b2506ee093e9b4c8af6e91201d476d426/manifests/config.pp#L53-L57 Change-Id: I93e1ee86197bcf271f18a62a27c2f350ed3966ea Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
2017-07-10Copy only generated puppet files into the containerMartin André72-214/+627
This solves a problem with bind-mounts when the containers are holding files descriptors open. At the same time this makes the template more robust to puppet changes since new config files will be available in the containers without needing to update the templates. Partial-Bug: #1698323 Change-Id: Ia4ad6d77387e3dc354cd131c2f9756939fb8f736