aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2017-03-06Make neutron dhcp agents per network conditionalBrent Eagles1-16/+23
While the heat templates specify a default value of 3, it rarely seems to have an effect as the tripleoclient is setting this according to the controller scale. This was fine before composable roles, but it is now invalid. While the client needs to be modified to no longer set this according to controller scale, the template should default to a sentinel value that will allow the puppet code to determine the proper value by the number of hosts that have the neutron dhcp agent deployed on them. Depends-On: I5533e42c5ba9f72cc70d80489a07e30ee2341198 Partial-bug: #1632721 Change-Id: I06628764c4769d91bbc42efe1c722702d6574d02 (cherry picked from commit 3c5345fc75da1e289929ef5caf08a0f75f904bb4)
2017-03-04Merge "Adding keystone parameters for Congress" into stable/ocataJenkins1-3/+11
2017-03-03Merge "Make UpdateDeployment depend on NetworkDeployment" into stable/ocataJenkins6-0/+6
2017-03-03Merge "Fix Panko API upgrade process" into stable/ocataJenkins1-1/+5
2017-03-03Make UpdateDeployment depend on NetworkDeploymentSteven Hardy6-0/+6
Prior to https://review.openstack.org/#/c/271450/ os-net-config was applied via os-refresh-config directly, which meant that even though UpdateDeployment and NetworkDeployment can be created concurrently, we'd always do the os-net-config step first. However now that we apply both steps via scripts (which are both handled via the same heat-config hook) we should add an explicit dependency to ensure the network is always fully configured before attempting to run any update. This should avoid the risk of e.g running an update on initial deployment before the network connectivity to access yum repos is in place. Change-Id: Idff7a95afe7b49b6384b1d0c78e76522fb1f8eb7 Related-Bug: #1666227 (cherry picked from commit 626b820b57498ff5002c5530962e6e4fd5644b51)
2017-03-03Merge "Add upgrade task for panko api" into stable/ocataJenkins1-5/+14
2017-03-03Fix Panko API upgrade processEmilien Macchi1-1/+5
Upgrade process wasn't consistent and correct. Change-Id: Id1f810d33c2909957be9a2c96d18c96dee939953 (cherry picked from commit 480baa3ce1c344b3279d5fe3292238c996bc856f)
2017-03-03Install nova-placement package on upgradeSteven Hardy1-0/+5
This doesn't exist in newton images, so install it via the ansible tasks during step3 (when all other packages are updated). Change-Id: I08fb7855b910ccc5a8ab2d73f1de15b695784abd Closes-Bug: #1664265 (cherry picked from commit e6ed8a75eb8bebd22eef469bedeea7beae28037d)
2017-03-03Add upgrade task for panko apiPradeep Kilambi1-5/+14
Change-Id: Icc5fbf99301ae47344e1582767e1e7a4687f491b (cherry picked from commit 7273a3de0296f6f75d4d549f72645ca916d967de)
2017-03-02Merge "upgrades/validation: only run validation when services exist" into ↵Jenkins36-5/+270
stable/ocata
2017-03-02Merge "Add mistral service support for composable upgrades" into stable/ocataJenkins3-0/+57
2017-03-02Upgrades: fix up the rabbitmq HA mode like in new ocata deploymentsMichele Baldessari1-0/+29
In ocata we changed the rabbitmq ha policy to "ha-exactly" via the following changes: - tht: Iace6daf27a76cb8ef1050ada0de7ff1f530916c6 - puppet-tripleo: Ib62001c03e1e08f58cf0c6e0ba07a8879a584084 We took care of the upgrade path via I3a97505d2ae1ae27f3080ffe74c33fdabffd2420 With the move to the ansible-based composable upgrades we left this change out. And now an upgraded environment has the following policy: - Upgraded environment Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}" - New environment Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}" We need to add this pcs resource change to the our upgrade scripts. Change-Id: I3c4113c207e9d0c45be43df7c2379ac26cb60692 Closes-Bug: #1668600 (cherry picked from commit 41514d0cd603194fecb327f96995c60a9fe6e67a)
2017-03-02Add mistral service support for composable upgradesSteven Hardy3-0/+57
Change-Id: I189edaf69c0e97a3399e6af939595f98322d7c03 Partially-Implements: blueprint overcloud-upgrades-per-service (cherry picked from commit dedef90750827fd7b413eac32223f929c8ac5555)
2017-03-02upgrades/validation: only run validation when services existEmilien Macchi36-5/+270
During upgrades, validation test if a service is running before the upgrade process starts. In some cases, servies doesn't exist yet so we don't want to run the validation. This patch makes sure we check if the service is actually present on the system before validating it's running correctly. Also it makes sure that services are enabled before trying to stop them. It allows use-cases where we want to add new services during an upgrade. Also install new packages of services added in Ocata, so we can validate upgrades on scenarios jobs. Change-Id: Ib48fb6b1557be43956557cbde4cbe26b53a50bd8 (cherry picked from commit 7c84a9b390c469e716e5802eef078d2df3902c6a)
2017-03-02Merge "neutron: don't set external_network_bridge option by default" into ↵Jenkins2-10/+28
stable/ocata
2017-03-02Merge "Put service stop at step1 and quiesce at step2." into stable/ocataJenkins49-55/+68
2017-03-01Merge "Add etcd composable upgrade steps" into stable/ocataJenkins1-0/+15
2017-03-01Put service stop at step1 and quiesce at step2.Sofer Athlan-Guyot49-55/+68
In the previous release[1], the services were stopped before the pacemaker services, so that they get a chance to send last message to the database/rabbitmq queue: Let's do the upgrade in the same order. [1] https://github.com/openstack/tripleo-heat-templates/blob/stable/newton/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh#L13-L71 Change-Id: I1c4045e8b9167396c9dfa4da99973102f1af1218 (cherry picked from commit fb7821378242e595184a38e1e0cb7e9978c0f806)
2017-03-01Merge "Adding upgrade_tasks to tacker" into stable/ocataJenkins1-0/+7
2017-03-01Merge "Adding upgrade steps to congress service" into stable/ocataJenkins1-0/+8
2017-03-01Merge "Add upgrade support for Horizon" into stable/ocataJenkins1-0/+16
2017-03-01Merge "Add zaqar service for composable upgrade" into stable/ocataJenkins1-0/+15
2017-03-01Adding upgrade_tasks to tackerDan Radez1-0/+7
Change-Id: I0d7e151a931d02068dea80d7cf57b99736e689e6 (cherry picked from commit 077c2eeb40bf1e9d5ad011c4c6036614d03886b6)
2017-03-01Adding upgrade steps to congress serviceDan Radez1-0/+8
Change-Id: I79169baf4c59e9325355992288de2e9ad8088e3b (cherry picked from commit bbe274862de5bfb317b9d44684556cb200c17f08)
2017-03-01Add upgrade support for HorizonEmilien Macchi1-0/+16
Change-Id: I91c3c93c1571288daa78b6d24b0aa9824a2bb5c4 (cherry picked from commit db02313b2869aac0d0ddd41129eb9bebed1a24ad)
2017-03-01Add etcd composable upgrade stepsCarlos Camacho1-0/+15
Adding etcd upgrade tasks Change-Id: Ie891a1a03585b3aec1ed30c176b5fb6b67d7e4b7 (cherry picked from commit 489761e848ad4be0eb67bc405968ef2870b81f05)
2017-03-01Merge "upgrades: fix ec2api conditional" into stable/ocataJenkins1-2/+2
2017-03-01Merge "Add support for upgrading ec2-api" into stable/ocataJenkins1-0/+16
2017-03-01Merge "Add auditd upgrate steps" into stable/ocataJenkins1-0/+15
2017-02-28upgrades: fix ec2api conditionalEmilien Macchi1-2/+2
Rename ec2-api_enabled to ec2_api_enabled so we avoid this error: The conditional check 'ec2-api_enabled.rc == 0' failed. The error was: error while evaluating conditional (ec2-api_enabled.rc == 0): 'api_enabled' is undefined"} Change-Id: Id325fd7eba397155eac7fb6c7410f88486173ba1 (cherry picked from commit d54532679edce04a5bdc3159489b77baf90b14ca)
2017-03-01Adding keystone parameters for CongressDan Radez1-3/+11
Change-Id: Ic50aee9e635f62f06fa757fa3d88d9d8c5b28fcb (cherry picked from commit 242fd3072dd31effa4305567163469ec83e7a532)
2017-02-28Adding keystone parameters for TackerDan Radez1-3/+11
Change-Id: I256d2fcb6353d029750113c1fec59a89c82583ca (cherry picked from commit a9c64bd39d28cc073a7f2d19a17466d29be6cc0f)
2017-02-28Add auditd upgrate stepsCarlos Camacho1-0/+15
Add base upgrade steps for auditd Change-Id: Iaa56eb40ed80d20744cf8bab18504d700466d26e (cherry picked from commit 5838d6f765a1ca9535b5d57c1299439040a5def2)
2017-02-28Add zaqar service for composable upgradeCarlos Camacho1-0/+15
Change-Id: I316e14317e0586e895dcb4e084aa54e7665f6a20 (cherry picked from commit 2cebb99729005a31fbe24a957d2db84397f1952a)
2017-02-28Add support for upgrading ec2-apiCarlos Camacho1-0/+16
Change-Id: I2703dd1a7e3eefa0ad6f7b74183101de6c1ad915 (cherry picked from commit b6214b0c5b92c85dbfa45007295db70888b509ab)
2017-02-28Merge "Install openstack-panko-api on upgrade" into stable/ocataJenkins1-0/+6
2017-02-27Update the Nova Endpoint information for CinderRhys Oxenham1-1/+2
This patch updates the Cinder service to reference the correct catalogue entries for Nova as configured by TripleO. The default settings as set by TripleO do not match our catalogue entries, and when Cinder attempts to callback to Nova in certain events (such as a Cinder volume retype) it can raise an EndpointNotFound error. Out of the box we have settings in /etc/cinder/cinder.conf like: nova_catalog_info = compute:Compute Service:internalURL With the format as "<service_type>:<service_name>:<endpoint_type>" Yet our catalogue has no mention of 'Compute Service'. This patch also fixes the reference for the adminURL also. Related-Bug: #1668281 Change-Id: I888ee07ef02d82578867e33608901c06e6478472 Co-Authored-By: Greg Charot <gcharot@redhat.com> (cherry picked from commit 09d8c1278604cc2aec42b7284c01cf7eb8b074b6)
2017-02-27Install openstack-panko-api on upgradeMarius Cornea1-0/+6
This doesn't exist in newton images, so install it via the ansible tasks during step3 (when all other packages are updated). Change-Id: I700a711473d10a50fad6b1797453a74c0cdff54b Closes-Bug: 1667965 (cherry picked from commit 63cb515c602d8a231a086b1db098c129ed81eaff)
2017-02-26Don't assume default network names in net_ip*mapSteven Hardy1-9/+35
This needs to handle a ServiceNetMap containing non-default network names when they are overridden via the *NetName parameters. Closes-Bug: #1651541 Change-Id: I95d808444642a37612a495e822e50449a7e7da63 (cherry picked from commit 47f2579fa24e722b451c29b5f6435c5b5fe65429)
2017-02-26Merge "Adding the ip_conntrack_proto_sctp kernel module" into stable/ocataJenkins1-0/+1
2017-02-25Remove forgotten sahara dbsync from step5 upgrades tasksmarios1-3/+0
I suspect this was forgotten from the initial commits where we were doing the dbsync in ansible Change-Id: Ie337bfba4e61cf3d546d0b79b611b84211ac9d9d (cherry picked from commit a6789350a292b68fa0c5d0668b4cf1a1f6831531)
2017-02-25Merge "Upgrade nova-api/scheduler/conductor packages at step3 not step2." ↵Jenkins4-11/+4
into stable/ocata
2017-02-24Upgrade nova-api/scheduler/conductor packages at step3 not step2.Sofer Athlan-Guyot4-11/+4
The nova-api, nova-scheduler nova-conductor packages are updated during step2. The package upgrade trigger a restart of the service which fails and is constantly retried by systemd: Feb 24 12:34:24 centos-7-2-node-rax-iad-7463943-440549 systemd[1]: Failed to start OpenStack Nova Scheduler Server. Feb 24 12:34:24 centos-7-2-node-rax-iad-7463943-440549 systemd[1]: Unit openstack-nova-scheduler.service entered failed state. Feb 24 12:34:24 centos-7-2-node-rax-iad-7463943-440549 systemd[1]: openstack-nova-scheduler.service failed. Feb 24 12:34:24 centos-7-2-node-rax-iad-7463943-440549 systemd[1]: openstack-nova-scheduler.service holdoff time over, scheduling restart. We eventually reach timeout. We use https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/services/tripleo-packages.yaml#L44-L46 to upgrade existing packages. Add a note to the README.rst to make people aware of the general upgrade done at step3 and limit its usage to new package for individual service. Change-Id: I13b51bcfe0c98034944613f7e1c3f0168cd4de76 Closes-Bug: #1667728 (cherry picked from commit 5593877817b332bd7a650f051cff5f5988ab1e54)
2017-02-24Add checks in ansible upgrade tasks for CephMon and CephOSDGiulio Fidente3-19/+78
Adds two checks, one for the CephMon and one for the CephOSD upgrade tasks borrowed from ceph-ansible. Change-Id: I0a0e60d277240130c6bd76a74ccc13354b87a30a Co-Authored-By: Sebastien Han <seb@redhat.com> (cherry picked from commit a3df16776dd5d7eb0a60ca4c58cef9913eb1c5cb)
2017-02-24Adding the ip_conntrack_proto_sctp kernel moduleItzik Brown1-0/+1
When using conntrack there is a need to load the ip_conntrack_proto_sctp module for SCTP to work. Closes-bug: 1664192 Change-Id: Ic58f5327401c3ab2215acd8b9ce699f555e8c5e4 (cherry picked from commit 135cc2962d8cee920ddc4ff9bf9bb373c62ea8c5)
2017-02-23Increase ansible-pacemaker default service start timeoutmarios1-1/+1
We are passing 200 but in some environments this has been seen to expire by a few seconds. Change-Id: I5c2270559339ea9ee0043b7a2e519e26d4d9d78a Closes-Bug: 1666604 (cherry picked from commit 8448c92203596ca578f85bdd7ffc96dd79adfe3e)
2017-02-23neutron: don't set external_network_bridge option by defaultIhar Hrachyshka2-10/+28
It's deprecated, to be removed in Ocata, and it's discouraged to set it to anything but the default value ('') that means that routers are not plugged directly into br-ex, but allows l2 agent to do the wiring. There are known issues with setting it to br-ex (like wrong port statuses): If533cf7c4c379be78f5a15073accaff7f65973ab The only caveat to setting it to the default ('') value is that in that case l2 agent should be configured with bridge mapping for physical networks. Since we already configure bridge_mappings for the agent, we should be safe to unset the option. Now that it's the default, there is no reason to override it in example environments. This patch also changes the description for the parameter to make it more clear that users are not expected to set it unless they know what they are doing. Also, moved the parameter into deprecated section to make it even more clear it's not something to touch in new deployments. Change-Id: Iade7fbaf92c8c601227f4456a15ea3f13a907ee2 Related-Bug: #1563070 (cherry picked from commit 21d2afd4bf9f57fd0fb3709d87acb452f13912df)
2017-02-23Merge "Add step0,validation checks for heat services" into stable/ocataJenkins4-4/+4
2017-02-22Merge "Make the DB URIs host-independent for all services" into stable/ocataJenkins21-38/+52
2017-02-21Add step0,validation checks for heat servicesmarios4-4/+4
These are currently commented out because we were waiting for I7612189be49c9c07f64753c1be4b72aa8524d06d to enable these in the ci upgrades job. Change-Id: I07bc0c2af0b227416470e23ad42f3a9aae430271 (cherry picked from commit 5d33537c0d27617a148784296483f92215c81adb)