aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2017-03-27Merge "etcd: secure EtcdInitialClusterToken parameter" into stable/ocataJenkins1-1/+1
2017-03-26Merge "Deploy versionless keystone endpoints (for keystone only)" into ↵Jenkins1-0/+1
stable/ocata
2017-03-25Merge "Explicitly configure credentials used by ironic to access other ↵Jenkins1-4/+39
services" into stable/ocata
2017-03-25Fixes OpenDaylightProviderMappings hiera parsingTim Rozet1-5/+1
The str_replace conversion used previously is no longer needed and breaks the hieradata value. Closes-Bug: 1675426 Change-Id: I7a052d1757efe36daf6ed47e55598ca3c2ee9055 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit ae10ae4a5a21bb58c183aa50f237ffa2d6f14280)
2017-03-22etcd: secure EtcdInitialClusterToken parameterEmilien Macchi1-1/+1
Secure EtcdInitialClusterToken parameter by: * removing the default value. * make it hidden. Change-Id: I938af697f9faaadb9c9aeb950e9410db24b1b961 Depends-On: I6e30cce469736e84a3c483fafa29d542b8347ba9 Closes-Bug: #1673266 (cherry picked from commit 55d17ca118d27f16b57424774265f5b3db7b7b52)
2017-03-22Deploy versionless keystone endpoints (for keystone only)Juan Antonio Osorio Robles1-0/+1
The default is to deploy v2.0 endpoints, but this is not the recommended approach. we should instead be using versionless endpoints Change-Id: Icbfae1c2ff2b7312646fd8e817dd8209220a0d96 Related-Bug: #1667679 (cherry picked from commit 40a50031f37df0f0cde53e3f3c15ffe407fbdcbd)
2017-03-21Explicitly configure credentials used by ironic to access other servicesDmitry Tantsur1-4/+39
Using keystone_authtoken credentials for this purpose is deprecated, and also prevents ironic-conductor from being used as a separate role. Also remove neutron_url, it can be fetched from the catalog instead. Change-Id: I12822568cb4db31808aec5fd407d71fe4b7b09e0 Depends-On: I21180678bec911f1be36e3b174bae81af042938c Partial-Bug: #1661250 (cherry picked from commit 91d7d8c46858d42e6cf2354a3be6af6c5bb9c02e)
2017-03-18Make sure PrePuppet runs before any Deployment_StepMichele Baldessari1-1/+3
We used to have this in mitaka: https://github.com/openstack/tripleo-heat-templates/blob/stable/mitaka/puppet/controller-post.yaml#L45 but we lost it along the way. The problem without this change is that we are open to the following race: 1) ControllerDeployment_Step1 is started and manages to do a successful "systemctl start pacemaker" 2) PrePuppet gets called and in the HA deployment calls pacemaker_maintenance_mode.sh 3) pacemaker_maintenance_mode.sh will set the maintenance-mode=true property because the pacemaker service is already up: https://github.com/openstack/tripleo-heat-templates/blob/master/extraconfig/tasks/pacemaker_maintenance_mode.sh#L8-L9 4) If the maintenance property is set to true at this stage, the creation of any resource will take place but they won't really start. Note that this is not a straight cherry pick from commit bae48e60b3cb9b5f21490997ca39c1e0e23fd195 because in ocata only ControllerPrePuppet exists and not {{role.name}}PrePuppet like in pike. Change-Id: Icb7495edd00385b2975dd42f63085d20292ef9a9 Closes-Bug: #1673795 Co-Authored-By: Jiri Stransky <jstransk@redhat.com>
2017-03-16Upgrades: wait for galera to be settledMichele Baldessari1-2/+4
We also need to wait for the galera resource to settle down before we proceed starting up with the other services. Note that before merging this, we need to land the following change in ansible-pacemaker: https://review.gerrithub.io/#/c/351387/ D-O is needed for upgrades to work against stable/* branches. Depends-On: I712abe71f97c22ee3d55d9db2f641096f8a7350c Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd Closes-Bug: #1668372 (cherry picked from commit 841d30549bd27a8b5669955196e14085025dafad)
2017-03-08Adds upgrade tasks for OpenDaylight servicesTim Rozet2-0/+37
Change-Id: I740b20b12acb3740886409bff86c4989f0a066f4 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 20d7901ab24e93e0224cc1c8b0cde3eb80122818)
2017-03-07Use the new hiera hook in all remaining templatesmarios7-160/+153
The new hiera hook in I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e was added to most of the tripleo-heat-templates in Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1 The new hook is installed by default if you use tripleo-common Ia1864933235152b7e899c4442534879f8e22240d and will be installed as part of the Newton to Ocata upgrades workflow in I0c7a32194c0069b63a501a913c17907b47c9cc16 In order to use the new hiera data as part of the upgrade we need to remove the old hieradata which will break anyone still defining and using it. This change updates the remaining vendor plugin manifests to use the new hiera hook. The pre-requisite is that the new hook is installed on their overcloud (as above it comes if you follow the N..O upgrade) Change-Id: Ic95154734cb21e6b941c7f1569295b413963831d (cherry picked from commit c5d10cd9fc94e6557417673190b73867a83cbb7b)
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