summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-23Merge "Make collectd log to file"Jenkins1-3/+17
2017-06-22Merge "Revert "Blacklist support for ExtraConfig""Jenkins11-192/+7
2017-06-22Merge "scenario003: containerize services for CI"Jenkins1-5/+5
2017-06-22Merge "Specify file url when deploy-artifacts fails"Jenkins1-1/+1
2017-06-22Merge "Fixes incorrect glance api network"Jenkins2-1/+4
2017-06-22scenario003: containerize services for CIEmilien Macchi1-5/+5
Change-Id: I152f5c97d2545aa595e193218653a4b7e56c0cb6
2017-06-22Merge "Fix fallback logic in run-os-net-config.sh"Jenkins1-1/+1
2017-06-22Merge "Remove add_listen: false from Horizon hieradata"Jenkins1-1/+0
2017-06-22Merge "Test Horizon by default in multinode jobs"Jenkins1-0/+2
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-22Merge "Deploy ironic-api with WSGI"Jenkins2-4/+36
2017-06-22Revert "Blacklist support for ExtraConfig"Alex Schultz11-192/+7
This reverts commit d6c0979eb3de79b8c3a79ea5798498f0241eb32d. This seems to be causing issues in Heat in upgrades. Change-Id: I379fb2133358ba9c3c989c98a2dd399ad064f706 Related-Bug: #1699463
2017-06-22Merge "Remove trailing whitespace"Jenkins0-0/+0
2017-06-21Fix fallback logic in run-os-net-config.shBen Nemec1-1/+1
The expression "${variable:-''}" with $variable unset results in a value that looks like "''", which will not pass a -z test, as I believe is intended in this code. Making the default value blank yields the correct behavior. Change-Id: I9fe98f3c69c797feb9c37da1ad8c7912a15bcecb Closes-Bug: 1699614
2017-06-21Fixes incorrect glance api networkTim Rozet2-1/+4
The glance API network was being set to storage and it should be internal_api. Closes-Bug: 1699535 Change-Id: I75bc05aeab999f0e3eb3f4ebaceb276e888addc9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-06-21Merge "Add node's FQDN to mysql certificate request and CA file"Jenkins2-0/+20
2017-06-21Deploy ironic-api with WSGIDmitry Tantsur2-4/+36
Change-Id: Ifa985f29fbd589f58cb2fc75b5f442f7651fb2bf Depends-On: I952c86db88dcd611722a3feaea88f618eee17620
2017-06-21Specify file url when deploy-artifacts failsArie Bregman1-1/+1
Change-Id: Iccd31c798b91c494b20489d52e289d9a250b929c
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-20Remove add_listen: false from Horizon hieradataBen Nemec1-1/+0
I'm not sure why this was here, but without a Listen directive in Apache's ports.conf Horizon is inaccessible. Removing this allows Horizon to work again. Change-Id: Ic221e15f188cf50b485e995035cb96f5d5960a72 Closes-Bug: 1696439
2017-06-20Test Horizon by default in multinode jobsBen Nemec1-0/+2
Horizon is a pretty core service for the overcloud, so we should test it in the gate jobs. The TripleoFirewall service is also included so the Horizon ports get opened correctly. Change-Id: I844b6eee547f9b4aa8e0935ab2e1e458f7a9e960
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-19Add node's FQDN to mysql certificate request and CA fileJuan Antonio Osorio Robles2-0/+20
This will add the node's FQDN to the mysql certificate request besides the VIP's FQDN which we already use. This is needed for adding TLS to the replication traffic. The CA file was also added as hieradata, since the path will be needed for the TLS configuration. bp tls-via-certmonger Change-Id: I9252303b92a2805ba83f86a85770db2551a014d3
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