aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-30Merge "Ensure boostrap_host_exec runs as root"Jenkins3-0/+20
2017-06-30Merge "scenario001: containerize services for CI"Jenkins1-5/+7
2017-06-30Merge "Add a docker-ha.yaml environment file for containerized HA deployments"Jenkins5-0/+26
2017-06-30Merge "Force mtime for tar used in container config md5sums"Jenkins1-1/+1
2017-06-30Merge "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"Jenkins1-2/+5
2017-06-30Ensure boostrap_host_exec runs as rootMartin André3-0/+20
This is necessary for accessing the bind mounted hieradata in the container in order to determine if the node is the primary node. With the new validation added to yaml-validate.py, we could spot potential issues in sahara-api and keystone bootstrap tasks. The keystone one is a false positive, as the image defaults to the root user in order to be able to run apache. Still, it is better to be consistent here and specify the root user nonetheless. Change-Id: Ib0ff9748d5406f507261e506c19b96750b10e846 Closes-Bug: #1697917
2017-06-30Fix typo in config_volumeSven Anderson1-2/+2
Change-Id: I6a53a56c534f24cb514d8aeb8cec3d7865b93448
2017-06-30Bind mount needed cert for haproxyMartin André1-0/+12
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. [1] https://github.com/puppetlabs/puppetlabs-haproxy/blob/4753ea5b2506ee093e9b4c8af6e91201d476d426/manifests/config.pp#L53-L57 Change-Id: Id2df144b678769def204961236624091d4e5c457
2017-06-30Allow volumes in puppet_config containers specJames Slagle1-1/+1
Mounting host volumes when running containers via puppet_config already works and is supported with docker-puppet.py. However, the validation in yaml-validate.py does not allow it. This patch makes it allowed by the validation. It is sometimes necessary since some puppet modules expect to make persistent file system changes other than just configuration data under /etc. In particular, ironic inspector expects to configure a http and tftp root director with an ipxe configuration. See: https://github.com/openstack/puppet-ironic/blob/master/manifests/inspector.pp These changes would be lost if the value for those directories are not mounted as host volumes. Change-Id: Ie51c653f4c666fbaaef0ea80990e2e61f4b1353b
2017-06-30Merge "Add missing xinetd/rsync container for Swift"Jenkins1-1/+21
2017-06-30Merge "Add detach to docker-toool"Jenkins1-6/+10
2017-06-30Merge "Add README to ci/environments directory"Jenkins1-0/+4
2017-06-30Merge "Add release note for generated sample environments"Jenkins1-0/+21
2017-06-30Merge "Remove ceilometer upgrade from other ceilometer containers"Jenkins2-28/+0
2017-06-29Merge "Add heat parameter for all of config_volume images"Jenkins79-216/+532
2017-06-29cisco nexus: keep OVS on the ComputeGonéri Le Bouder1-1/+0
The Cisco Nexus-UCSM environment relies on OVS for the communication with compute nodes. This is a partial revert of I4c98008107568b3b65decd7640e25c7d2b1ea9ff. Change-Id: I453d4bc83314a76fd779884fb2f8cd1731d2bcaa Related-Bug: #1687597
2017-06-29Add stack_name/ctlplane_service_ips into post-upgrade.j2.yamlSteven Hardy1-2/+5
Upgrades are broken because this was missed from I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a and Ia619ab935c66081769e69c53d1ca41925d86abbb Change-Id: I96590e2219df64b94dfecd91d5e25231fc7e514b Related-Bug: #1700755
2017-06-29Force mtime for tar used in container config md5sumsSteven Hardy1-1/+1
The checksum is changing each run because the mtime is different, so force a specific date such that we only compare the directory contents. Change-Id: I5ed2b50176f902d7af12b96e650b67b736d59a4a
2017-06-29Make ceilometer crontab removal idempotentJiri Stransky1-0/+3
When we re-execute an upgrade and the crontab has already been removed, the crontab removal returns 1, saying "no crontab for ceilometer", and the upgrade fails. This change makes the removal idempotent. Change-Id: Ic955fb67bb2f7afde44291f7db3293c88f167566 Closes-Bug: #1701250
2017-06-29scenario001: containerize services for CIEmilien Macchi1-5/+7
Change-Id: I4308032891f0f9f5e93159f4a7ca29dada5850be
2017-06-29Merge "Enable nova-api to run over httpd again"Jenkins2-112/+111
2017-06-29Install ansible-pacemaker on O->P upgradeJiri Stransky1-0/+2
This has been omitted in Ocata image, so we need to install this in O->P upgrade again. Change Ic8ce72133c47a4c90d581a0925213877b11a471e adds it to the image, so that we can stop installing it on P->Q upgrade, and start using it for minor updates too. Change-Id: I893792e8d82c716b2f3e7b8878b25ba89ea724f1 Co-Authored-By: Marius Cornea <mcornea@redhat.com> Partial-Bug: #1701208
2017-06-29Add ServerIdMap outputSteven Hardy1-0/+18
This exposes the nova server IDs for each role, and the bootstrap node so that we can add this data to the tripleo dynamic ansible inventory Change-Id: I2fc48eec77210805c0139fa4abcbf4dd721e7c37
2017-06-29Merge "Default docker-puppet.py logging to INFO"Jenkins3-11/+26
2017-06-28Merge "Disable swift middleware ceilometer pipeline by default"Jenkins2-12/+22
2017-06-28Remove ceilometer upgrade from other ceilometer containersPradeep Kilambi2-28/+0
Lets just run the ceilometer upgrade once in central agent container Change-Id: If5e5ca6122f8583c6221bc6b343e483e41f04d29 Closes-bug: #1700056
2017-06-28Enable nova-api to run over httpd againJuan Antonio Osorio Robles2-112/+111
This is needed for TLS everywhere. Change-Id: Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3 Depends-On: I426bfdb9e6c852eb32d10a12e521bb8b47701c41
2017-06-28Default docker-puppet.py logging to INFODan Prince3-11/+26
If you want debug logging you can set the new DockerPuppetDebug heat parameter to 'True'. Change-Id: Iae7bb67379351ea15d61c331867d7005f07ba98e Closes-bug: 1700570
2017-06-28Disable swift middleware ceilometer pipeline by defaultPradeep Kilambi2-12/+22
This generates tons of unnecessary events when gnocchi uses swift backend. We end up filtering most of these anyway. So lets disable this so it doesn't put useless load. Also changing the default project to service as thats what gnocchi uses to authenticate with swift. Closes-bug: #1693339 Change-Id: I40f47d46fdb06f31a739b590bf653bca71e33f61
2017-06-28Add missing xinetd/rsync container for SwiftChristian Schwede1-1/+21
Swift object replication relies on the rsync server, which is run by xinetd. This patch adds the missing container and configuration. Note that xinetd needs bind to a privileged port (873) and has to be started as root therefore. Change-Id: I7655c9dd116c0130035d8a2fae81148171ae6448
2017-06-28Add heat parameter for all of config_volume imagesMartin André79-216/+532
This commit consistently defines a heat template parameter in the form of DockerXXXConfigImage where XXX represents the name of the config_volume that is used by docker-puppet. The goal is to mitigate hard to debug errors where the templates would set different defaults for the image docker-puppet.py uses to run, for the same config_volume name. This fixes a couple of inconsistencies on the way. Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b Closes-Bug: #1699791
2017-06-28Add ctlplane_service_ips param to upgrade stepsJiri Stransky1-1/+3
Upgrades were broken because of this missing parameter. Change-Id: Ia88a9833ab8aa26ccc40ee235b8554c9a7fbd22d Closes-Bug: #1700923
2017-06-27Merge "Add docker templates for octavia services"Jenkins5-0/+474
2017-06-27Merge "Add Ceph configuration with PoolDefaultSize 1"Jenkins1-0/+2
2017-06-27Merge "Allow stack_name into major_upgrade_steps.yaml"Jenkins1-1/+4
2017-06-27Merge "Add validation check for divergent parameter definitions"Jenkins1-4/+71
2017-06-27Add README to ci/environments directoryBen Nemec1-0/+4
Let's be clear that the contents of this directory are for ci use only and should not be used in production. Change-Id: I3b448b9922c207b29cbdae36ee876368bda23dac
2017-06-27Add Ceph configuration with PoolDefaultSize 1Sagi Shnaidman1-0/+2
Add Ceph pool size configuration for CI where PoolDefaultSize is 1 Change-Id: I626d1398e31c3fcb9f100a8b185d71ba5909034a
2017-06-27Merge "Add non-ha env file."Jenkins1-0/+16
2017-06-27Merge "Adds service for OVS and enables ODL DPDK deployments"Jenkins10-143/+395
2017-06-27Re-enable default for RoleParametersBen Nemec5-0/+5
I471037de35e7f349d900462ec3ffb16fe2d6ebd9 accidentally removed the default from the RoleParameters parameter. This change just puts it back. Change-Id: I29b472897e07229715fc2fea3b55e90473eb0069
2017-06-27Make NovaWorkers descriptions consistentBen Nemec4-4/+4
Partial-Bug: 1700664 Change-Id: I12ee7ab825069c1741438499f8df835014afc37f
2017-06-27Add validation check for divergent parameter definitionsBen Nemec1-4/+71
Many of our parameters are defined in multiple templates, but currently there is no easy way of checking that all of those definitions match. It can be confusing when a parameter is defined one way in one file and another way in a different file. For example, the NovaWorkers description is: Number of workers for Nova API service. and Number of workers for Nova Placement API service. and Number of workers for Nova Conductor service. Which is it actually? All of them. That one parameter controls the workers for all of the nova services, and its description should reflect that, no matter which template you happen to look at. This change adds a check to yaml-validate.py to catch these sorts of inconsistencies and allow us to eventually prevent new ones from getting into the templates. An exclusion mechanism is included because there are some parameter definitions we probably can't/shouldn't change. In particular, this includes the network cidrs which are defaulted to ipv4 addresses in the ipv4 net-iso templates and ipv6 in the ipv6 templates. It's possible a user would be relying on one of those defaults in their configuration, so if we change it they might break. To get around that, the tool explicitly ignores the default field of those parameters, while still checking the description and type fields so we maintain some sanity. There may be other parameters where this is an issue, but those can be added later as they are found. For the moment any inconsistencies are soft-fails. A failure message will be printed, but the return value will not be affected so we can add the tool without first having to fix every divergent parameter definition in tripleo-heat-templates (and there appear to be plenty). This will allow us to gradually fix the parameters over time, and once that is done we can make this a hard-fail. Change-Id: Ib8b2cb5e610022d2bbcec9f2e2d30d9a7c2be511 Partial-Bug: 1700664
2017-06-27Allow stack_name into major_upgrade_steps.yamlGiulio Fidente1-1/+4
On upgrade we map PostDeploySteps to a different implementation which we missed to update in I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a Change-Id: Ia619ab935c66081769e69c53d1ca41925d86abbb Closes-Bug: #1700755
2017-06-27Merge "Provides a list of per-service ctlplane IPs to the workflows env"Jenkins5-0/+42
2017-06-27Merge "Add flag to enable/disable the HAProxy stats interface"Jenkins2-0/+9
2017-06-27Merge "Allows use of Mistral workflows during deployment steps"Jenkins7-13/+183
2017-06-27Merge "Enable DPDK on boot using PreNetworkConfig"Jenkins8-2/+109
2017-06-26Merge "Add VipMap output"Jenkins2-0/+11
2017-06-26Merge "Add split-stack environments"Jenkins6-7/+42