summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-22Make collectd log to fileMartin Mágr1-3/+17
- sets collectd service in container to log to file consistently with other docker services. - corrects configuration mounts Depends-On: I50289ad6657852d37abbf12938128ff9ab9e3bac Change-Id: Ibf9efbe249d67d0fa1e50fbd7dd9902a64d5a273
2017-06-21Merge "Add an upgrade task for redis service"Jenkins1-0/+20
2017-06-20Merge "Fixup for manila-api containerized service"Jenkins1-13/+25
2017-06-20Add an upgrade task for redis servicePradeep Kilambi1-0/+20
Change-Id: Id7188ee8a4b05f0aa3c76c4da581e8c4f1b85d86
2017-06-20Merge "Comment parameters for registry in docker tls env"Jenkins1-4/+4
2017-06-19Merge "Blacklist support for ExtraConfig"Jenkins11-7/+192
2017-06-19Merge "Add nested sample environments for inject-trust-anchor"Jenkins8-1/+159
2017-06-19Merge "Add storage sample environments"Jenkins13-16/+503
2017-06-19Merge "Add neutron-midonet sample environment"Jenkins3-0/+102
2017-06-19Merge "Support config dir for env generator input files"Jenkins13-14/+900
2017-06-19Merge "Update CloudDomain description"Jenkins7-14/+14
2017-06-19Merge "Add an example IronicConductor role"Jenkins2-0/+26
2017-06-19Merge "Updated from global requirements"Jenkins1-8/+8
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-19Updated from global requirementsOpenStack Proposal Bot1-8/+8
Change-Id: I9496de0e5cc670e0a370588a9471594b20fdadf3
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-16Blacklist support for ExtraConfigJames Slagle11-7/+192
Commit I46941e54a476c7cc8645cd1aff391c9c6c5434de added support for blacklisting servers from triggered Heat deployments. This commit adds that functionality to the remaining Deployments in tripleo-heat-templates for the ExtraConfig interfaces. Since we can not (should not) change the interface to ExtraConfig, Heat conditions are used on the actual <role>ExtraConfigPre and NodeExtraConfig resources instead of using the actions approach on Deployments. Change-Id: I38fdb50d1d966a6c3651980c52298317fa3bece4
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-15Update CloudDomain descriptionBen Nemec7-14/+14
First, this parameter must match what is configured on the undercloud, so strengthen that language. There is also now an undercloud.conf parameter that can be used to set the requisite options on the undercloud services, so just point users at that rather than trying to explain how to configure the services manually (which is error-prone and doesn't survive undercloud updates). Change-Id: I002cce176e3430473a29e79efde3464bddb24cc7
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-15Fixup for manila-api containerized serviceMartin André1-13/+25
Use common volumes, and use the host log dir in DB sync container. Co-Authored-By: Jiri Stransky <jistr@jistr.com> Change-Id: I52602eb4ffd8834c36eec66ef845e5563f72f786
2017-06-15Add an example IronicConductor roleDmitry Tantsur2-0/+26
Change-Id: I8dca09372a58b6dacbb8e65602e1b0bdb6c01ae7 Related-Blueprint: example-custom-role-environments
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