aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-20Add defaults for docker puppet tasksSteven Hardy1-4/+10
Currently we're referencing some steps that don't exist in the output from the OS::Heat::Value resource, but as noted in the heat bug #1681749 I think this isn't valid and probably should not be allowed, so instead merge defaults with the non-empty step tasks. To avoid further duplication of the loop variables, I made the max step a variable. Change-Id: Icf3d639b53c97006a0c370c12600449fba6f3323 Related-Bug: #1681749
2017-04-16Revert "Use httpd in Zaqar docker service"Dan Prince1-6/+3
This reverts commit 57a26486128982c9887edd02eb8897045215b10a. Change-Id: I1bbe16a1a7a382ae0c898bd19cd64d3d49aa84c7 Closes-bug: #1683210
2017-04-14Merge "Allow for update after RHEL registration"Jenkins2-0/+43
2017-04-13Merge "Add name and description fields to plan-environment.yaml"Jenkins2-5/+11
2017-04-13Merge "Add tags to roles"Jenkins5-7/+52
2017-04-13Merge "Use comma_delimited_list for token flush cron time settings"Jenkins1-5/+5
2017-04-13Merge "Do not log errors on non-existing container"Jenkins1-1/+4
2017-04-13Merge "Add Docker to services list in multinode CI environments"Jenkins7-0/+8
2017-04-12Merge "Update Dell EMC Cinder back end services"Jenkins2-0/+6
2017-04-12Merge "yum_update.sh - Use the yum parameter: check-update"Jenkins1-3/+11
2017-04-12Merge "Add upgrade tasks for gnocchi container services"Jenkins3-0/+12
2017-04-12Merge "Add IPv6 disable option"Jenkins2-0/+15
2017-04-12Merge "Use httpd in Zaqar docker service"Jenkins1-3/+6
2017-04-12Merge "Add composable role support for NetApp Cinder back end"Jenkins6-159/+132
2017-04-12Add name and description fields to plan-environment.yamlAna Krivokapic2-5/+11
Change-Id: I99b96343742ee5c40d8786e26b2336427e225c82 Implements: blueprint update-plan-environment-yaml
2017-04-12Merge "Bind mount directories that contain the key/certs for keystone"Jenkins2-0/+45
2017-04-12Merge "docker/all: Bind-mount OpenSSL CA bundle"Jenkins1-0/+6
2017-04-12Merge "Change the directory for httpd certs/keys to be service-specific"Jenkins1-2/+4
2017-04-12Add tags to rolesAlex Schultz5-7/+52
Prior to Ocata, the Controller role was hardcoded for various lookups. When we switched to having the primary role name being dynamically pulled from the roles_data.yaml using the first role as the primary role as part of I36df7fa86c2ff40026d59f02248af529a4a81861, it introduced a regression for folks who had previously been using a custom roles file without the Controller being listed first. Instead of relying on the position of the role in the roles data, this change adds the concepts of tags to the role data that can be used when looking for specific functionality within the deployment process. If no roles are specified with this the tags indicating a 'primary' 'controller', it will fall back to using the first role listed in the roles data as the primary role. Change-Id: Id3377e7d7dcc88ba9a61ca9ef1fb669949714f65 Closes-Bug: #1677374
2017-04-12Use comma_delimited_list for token flush cron time settingsJuan Antonio Osorio Robles1-5/+5
This allows us to better configure these parametes, e.g. we could set the cron job to run more times per day, and not just one. Change-Id: I0a151808804809c0742bcfa8ac876e22f5ce5570 Closes-Bug: #1682097
2017-04-12Bind mount directories that contain the key/certs for keystoneJuan Antonio Osorio Robles2-0/+45
This is only done when TLS-everywhere is enabled, and depends on those directories being exclusive for services that run over httpd. Which is the commit this is on top of. Also, an environment file was added that's similar to environments/docker.yaml. The difference is that this one will contain the services that can run containerized with TLS-everywhere. This file will be updated as more services get support for this. bp tls-via-certmonger-containers Change-Id: I87bf59f2c33de6cf2d4ce0679a5e0e22bc24bf78
2017-04-12docker/all: Bind-mount OpenSSL CA bundleJuan Antonio Osorio Robles1-0/+6
The containers also need to trust the CA's that the overcloud node trusts, else we'll get SSL verification failures. bp tls-via-certmonger-containers Change-Id: I7d3412a6273777712db2c90522e365c413567c49
2017-04-12Merge "Grouped all the Operational tools"Jenkins1-1/+9
2017-04-11Merge "Add missing name properties on deloyment resources"Jenkins2-0/+3
2017-04-11docker: use noop_resource for Nova_cell_v2Dan Prince1-1/+4
Per puppet-nova commit 2c743a6bff5b17a85d1e0500f3a9ecb21468204e there is now a custom resource for Nova_cell_v2 configuration. As this resource runs automatically regardless of our use of puppet tags we need to explicitly disable it to be able to generate Nova API configs for docker. Change-Id: Id675dc124464acddc3fc5a88b017a351e93ba685 Closes-bug: #1681841
2017-04-11Change the directory for httpd certs/keys to be service-specificJuan Antonio Osorio Robles1-2/+4
This moves the directories containing the certs/keys for httpd one step further inside the hierarchy. This way we will be able to bind-mount this certificate into the container without bind-mounting any other certs/keys from other services. bp tls-via-certmonger-containers Change-Id: Ibe6e66ae4589b9eab7db330dd8b178e0f8775639 Depends-On: I0b71902358b754fa8bd7fdbb213479503c87aa46
2017-04-11Merge "Decouple Swift ringbuilding logic"Jenkins5-94/+10
2017-04-11Add Docker to services list in multinode CI environmentsJiri Stransky7-0/+8
We need the service to be present to run jobs involving containers. Note that this is effectively a no-op for the current CI jobs, as by default the Docker service is mapped to OS::Heat::None. Docker will actually be deployed only if environments/docker.yaml is included in the deploy command. Change-Id: I97a35e30e428ff64feeb411bf63dbb7aa54f9829
2017-04-11Do not log errors on non-existing containerMartin André1-1/+4
This is cluttering up the logs with useless error messages, making it more difficult than necessary to debug the CI job. Change-Id: Icbdc4c74d99fea39b8722955dab56e5f538849aa
2017-04-11Add IPv6 disable optionzshi2-0/+15
This will give user the ability to set these values, if IPv6 is not to be used, it's recommended that it be disabled to reduce the attack surface of the system. Change-Id: Ib3142cce49b93a421ca142a59961ce49a77e66b1 Co-Authored-By: Luke Hinds <lhinds@redhat.com> Signed-off-by: zshi <zshi@redhat.com>
2017-04-11Merge "Replace references to the 192.0.2 network"Jenkins13-16/+39
2017-04-10Merge "Add BGPVPN services to scenario004"Jenkins3-1/+7
2017-04-10Merge "metadatahook: Use coalesce to handle null values"Jenkins1-3/+3
2017-04-10Update Dell EMC Cinder back end servicesAlan Bishop2-0/+6
Add services for Dell EMC Cinder back ends to the resource registry and to the Controller role (defaulting to OS::Heat::None). Closes-Bug: #1681497 Change-Id: I694fd7738abd3601851bdcd38e3633607ce6152c
2017-04-10Add composable role support for NetApp Cinder back endAlan Bishop6-159/+132
Convert NetApp Cinder back end to support composable roles via new "CinderBackendNetApp" service. Closes-Bug: #1680568 Change-Id: Ia3a78a48c32997c9d3cbe1629c2043cfc5249e1c
2017-04-10Merge "Remove yaql call when building logging_groups"Jenkins1-7/+4
2017-04-10Add upgrade tasks for gnocchi container servicesPradeep Kilambi3-0/+12
Change-Id: I43c35bbf959e5dcdd7e87a8f6a604d5fe5b4f2a9
2017-04-10Merge "sensu: fix upgrade case when service is added"Jenkins1-1/+1
2017-04-10Replace references to the 192.0.2 networkGiulio Fidente13-16/+39
Following change I1393d65ffb20b1396ff068def237418958ed3289 the ctlplane network will be 192.168.24 by default and not 192.0.2 anymore. This change removes old references left to 192.0.2 network from the overcloud templates. Change-Id: I1986721d339887741038b6cd050a46171a4d8022
2017-04-10Merge "Timeout early on pcs cluster status check0 during upgrade."Jenkins1-0/+2
2017-04-10metadatahook: Use coalesce to handle null valuesJuan Antonio Osorio Robles1-3/+3
This uses the coalesce function to take null values into account, else these resources will fail validation. Change-Id: Iaf4218dd731826f80b76ff8f7a902adc8c865be5 Closes-Bug: #1681332
2017-04-10Remove yaql call when building logging_groupsThomas Herve1-7/+4
yaql calls are fairly expensive. Let's try to not nest them when we can avoid it. Change-Id: I5e7dbc42be625bbfe7989867794a67ebae08687d
2017-04-10Decouple Swift ringbuilding logicChristian Schwede5-94/+10
This reverts commit b323f8a16035549d84cdec4718380bde3d23d6c3 and uses the new logic in puppet-tripleo (see Ifd6fa5b398d98e8998630ea0c9a2ce9867ceba2b ), basically doing the same. Closes-Bug: 1665641 Change-Id: Ib5cb0578be2993af0a0b8675005d838640bdb139
2017-04-07Merge "Avoid awk error in hosts-config.sh for large deployments"Jenkins1-8/+10
2017-04-07Merge "Prepare 7.0.0.0b1 (pike-1)"Jenkins1-2/+2
2017-04-07Merge "Update ceph-rgw acccepted roles to fix OSP upgrade"Jenkins1-1/+1
2017-04-07Prepare 7.0.0.0b1 (pike-1)Emilien Macchi1-2/+2
Change-Id: I93de22a4aa2d90966c24349e765475576947f2e0
2017-04-07Merge "Add Docker service to all roles"Jenkins3-0/+10
2017-04-07sensu: fix upgrade case when service is addedEmilien Macchi1-1/+1
When service is added during an upgrade, fix the ansible syntax to use the right variable for return code. Change-Id: I974699fb8b0dcbe5ffa6935c394df4ac8e7b21d4
2017-04-07Timeout early on pcs cluster status check0 during upgrade.Sofer Athlan-Guyot1-0/+2
There is a windows for the pcs cluster status to hang forever[1]. We add a timeout during check0 to avoid this situation. 2 minutes should be more than enought to get all the pcsd nodes to reply. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1292858 Closes-Bug: #1680477 Change-Id: Icb3dc76e031a3d4f26294f37d169f2f61d30973e