summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-19Comment parameters for registry in docker tls envMartin André1-4/+4
This commit brings change from I3896fa2ea7caa603186f0af04f6d8382d50dd97a to docker-services-tls-everywhere.yaml, which original commit message was: 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: Ifa95ef60bc17bd2638ebb6aebf77a819b28c9f0b Related-Bug: #1691524
2017-06-19Re-enable docker service in docker.yamlMartin André1-0/+2
It was removed by mistake from the docker.yaml environment file in I76f188438bfc6449b152c2861d99738e6eb3c61b. Change-Id: If8df98e1ddd0961ab0c9e5df917fef8200db65e6 Closes-Bug: #1698749
2017-06-17Merge "Remove duplicate docker/puppet services.yaml"Jenkins7-115/+19
2017-06-16Merge "Make a copy of files touched by puppet in container"Jenkins1-0/+7
2017-06-16Merge "Fall back to non-containerized cinder-backup to unblock OVB CI"Jenkins1-2/+2
2017-06-16Merge "Add Ec2Api to container based deployment"Jenkins2-0/+155
2017-06-16Merge "Make fernet max active keys configurable"Jenkins2-0/+10
2017-06-16Merge "Add templates to configure Ironic inspector"Jenkins5-0/+160
2017-06-16Merge "Fall back to non-containerized cinder-volume to unblock CI"Jenkins1-1/+2
2017-06-16Merge "Only pass distinct services to enabled_services list"Jenkins1-1/+4
2017-06-16Make a copy of files touched by puppet in containerMartin André1-0/+7
This should help determine what exactly needs to be bind mounted in the container and should also help limit the size of collected logs in CI, as collecting the entire /etc directory from each container can grow pretty quickly in size and is not that useful. Related-Bug: #1698172 Change-Id: Ie2bded39cdb82a72f0c28f1c552403cd11b5af45
2017-06-16Fall back to non-containerized cinder-backup to unblock OVB CIJiri Stransky1-2/+2
The previous fix Ib10e4f18d967d356a15b97f58c488f8402a73356 made multinode CI pass, but there was still an error during volume scheduling on OVB: OSError: [Errno 13] Permission denied: '/var/lib/cinder/conversion' This was most likely due to cinder-volume was running on host and used host's cinder user, while we still deployed containerized cinder-backup and it chowned /var/lib/cinder under kolla's cinder user whose UID doesn't match the baremetal one. We didn't hit this issue in the multinode job because it doesn't presently deploy cinder-backup service at all. Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: I9ac74d6717533f59945694b4a43fe56d7ca768c6 Closes-Bug: #1698136
2017-06-16Merge "Pacemaker HA suport for OVN DB servers"Jenkins4-0/+89
2017-06-16Merge "Ignore case for bootstrap node checks"Jenkins3-3/+3
2017-06-16Merge "Conditional LVM storage setup for cinder-volume"Jenkins1-2/+6
2017-06-16Fall back to non-containerized cinder-volume to unblock CIJiri Stransky1-1/+2
CI was stuck on collecting logs. The collect-logs playbook, which normally takes just a few minutes, took more than an hour and was eventually killed. The playbook was stuck on collecting LVM info on the overcloud node, which runs this command: (vgs; pvs; lvs) &> /var/log/extra/lvm.txt Therefore it's very likely that the problematic part is the LVM setup in the containerized cinder-volume service, and falling back to non-contianerized for the time being should get the CI going again. Change-Id: Ib10e4f18d967d356a15b97f58c488f8402a73356 Closes-Bug: #1698136
2017-06-16Make fernet max active keys configurableJuan Antonio Osorio Robles2-0/+10
This will set the max_active_keys setting in keystone.conf, and furtherly we'll read this value from tripleo-common to do purging of keys if necessary. bp keystone-fernet-rotation Change-Id: I9c6b0708c2c03ad9918222599f8b6aad397d8089
2017-06-16Only pass distinct services to enabled_services listJuan Antonio Osorio Robles1-1/+4
The list that was passed contained repeated services, which was problematic if we wanted to use this list in puppet. So instead we pass a list with the unique names. Change-Id: Ib5eb0c5b59a9a50344d22c258ca461e8f1e52c86
2017-06-16Merge "Remove reference too puppet/services/ironic-pxe.yaml"Jenkins1-1/+0
2017-06-16Merge "Input enabled_services in all-nodes-config as comma_delimited_list"Jenkins1-9/+4
2017-06-15Merge "Bind mount internal CA file to all containers"Jenkins1-12/+57
2017-06-15Merge "Containerize Cinder-volume for HA"Jenkins1-0/+170
2017-06-15Ignore case for bootstrap node checksAlex Schultz3-3/+3
The bootstrap_nodeid can have capital letters while the hostname may not. In puppet we use downcase for this comparison, so let's follow a similar pattern for scripts from THT. Change-Id: I8a0bec4a6f3ed0b4f2289cbe7023344fb284edf7 Closes-Bug: #16998201
2017-06-15Add Ec2Api to container based deploymentSven Anderson2-0/+155
Depends-On: I5dc10ef5cccf6d378c20c68fc4a32d2d3c38233f Change-Id: Ib96040c2e27ad76b1fa6ecb9468bb9d97b3c4518
2017-06-15Merge "Containerize Ceilometer Agent Ipmi"Jenkins5-0/+117
2017-06-15Merge "Modify PreNetworkConfig config inline with role-specific parameters"Jenkins13-20/+159
2017-06-15Input enabled_services in all-nodes-config as comma_delimited_listJuan Antonio Osorio Robles1-9/+4
The bug that prevented it from being a comma delimited list was fixed. Change-Id: Ia5296140763849bdeac481c812f70a42d907c214
2017-06-15Merge "Fix race conditions between containers"Jenkins19-48/+43
2017-06-15Merge "Containerize Manila Scheduler service"Jenkins2-0/+106
2017-06-14Merge "Update Panko api port"Jenkins7-15/+19
2017-06-14Merge "Role Specific parameters for neutron-sriov-agent service"Jenkins1-3/+19
2017-06-14Merge "Sample environment generator"Jenkins11-0/+808
2017-06-14Merge "Add Nova Consoleauth service to containerized deployment"Jenkins2-0/+109
2017-06-14Merge "Add Nova Vncproxy service to containerized deployment"Jenkins2-0/+109
2017-06-14Merge "Enable heat/puppet to manage the fernet keys and make it configurable"Jenkins2-1/+15
2017-06-14Merge "Use KeystoneFernetKeys instead of individual parameters"Jenkins2-7/+29
2017-06-14Update Panko api portPradeep Kilambi7-15/+19
The current port conflicts with trove. This is updated in puppet module. See related change: https://review.openstack.org/#/c/471551/ Change-Id: Iefacb98320eef0bca782055e3da5d243993828d7
2017-06-14Merge "Fix network names when using network isolation"Jenkins1-1/+1
2017-06-14Merge "Dell SC: Add exclude_domain_ip option"Jenkins2-0/+5
2017-06-14Merge "Docker service for Cinder Volume"Jenkins2-0/+164
2017-06-14Fix race conditions between containersJiri Stransky19-48/+43
In many occasions we had log directory initialization containers without `detach: false`, which didn't guarantee that they'll finish before the container depending on them will start using the log directory. This is now fixed by moving the initialization container one global step earlier, so that we can keep the concurrency when creating the log dirs. (Using `detach: false` makes paunch handle just one container at a time, and as such it can have negative performance impact.) For services which have their container(s) starting in step_1, initialization cannot be moved to an earlier step, so the solution here was to just add `detach: false`. As a minor related change, cinder DB sync container now mounts the log directory from host to put cinder-manage.log into the expected location. Change-Id: I1340de4f68dd32c2412d9385cf3a8ca202b48556
2017-06-14Merge "Docker services for Cinder Backup"Jenkins2-0/+133
2017-06-14Remove reference too puppet/services/ironic-pxe.yamlDerek Higgins1-1/+0
The file doesn't exist. The pxe setup is part of puppet/services/ironic-conductor.yaml Change-Id: I3a6f038ed69ea44f0594064b6f9657ff1b72e1bb Closes-Bug: #1697927
2017-06-14Merge "Add fqdn_external"Jenkins6-0/+6
2017-06-14Merge "Generate HAproxy iptables rules for containerized HA deployments"Jenkins1-10/+13
2017-06-14Merge "Replace NO_ARCHIVE block with single call to rsync"Jenkins1-27/+13
2017-06-14Merge "Docker services for Cinder Api and Scheduler"Jenkins3-0/+278
2017-06-14Fix network names when using network isolationMichele Baldessari1-1/+1
When we merged If3989f24f077738845d2edbee405bd9198e7b7db we correctly used name_lower for most things but we left out the the OS::TripleO::Network resource which would cause errors like the following: Could not fetch contents for file:///tmp/tripleoclient-LdqQGJ/tripleo-heat-templates/network/internalapi.yaml The reason is that the network filename is called internal_api.yaml. Change-Id: I40f268668ed948e5d41ed0ff5a8fc954cef7b17c Closes-Bug: #1697883
2017-06-14Enable heat/puppet to manage the fernet keys and make it configurableJuan Antonio Osorio Robles2-1/+15
With the addition of the KeystoneFernetKeys parameter, it's now possible to do fernet key rotations using mistral, by modifying the KeystoneFernetKeys variable in mistral; subsequently a rotation could happen when doing a stack update. So this re-enables the managing of the key files by puppet. However, this is left configurable, as folks might want to manage those files out-of-band. bp keystone-fernet-rotation Change-Id: Ic82fb8b8a76481a6e588047acf33a036cf444d7d
2017-06-14Use KeystoneFernetKeys instead of individual parametersJuan Antonio Osorio Robles2-7/+29
This uses the newly introduced dict with the keys and paths instead of the individual keys. Having the advantage that rotation will be possible on stack update, as we no longer have a limit on how many keys we can pass (as we did with the individual parameters). bp keystone-fernet-rotation Change-Id: I7d224595b731d9f3390fce5a9d002282b2b4b8f2 Depends-On: I63ae158fa8cb33ac857dcf9434e9fbef07ecb68d