aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
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)
2017-02-20Stop nova-api before upgrading packageOliver Walsh1-3/+3
If the service is running then the rpm upgrade will attempt to restart. Ensuring the service is stopped before upgrade should resolve this. Change-Id: I4179cb773616721640490d26082eacac45f92dff Closes-Bug: 1665717 (cherry picked from commit 10ba1fa6068978d5779da4b3c6966d73e893a7e5)
2017-02-20Make the DB URIs host-independent for all servicesMichele Baldessari21-38/+52
When fixing LP#1643487 we added ?bind_address to all DB URIs. Since this clashes with Cellsv2 due to the URIs becoming host dependent, we need a new approach to pass bind_address to pymysql that leaves the DB URIs host-independent. In change Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18 we first create a /etc/my.cnf.d/tripleo.cnf file with a [tripleo] section with the correct bind-address option. In this change we make sure that the DB URIs will point to the added file and to the specific section containing the necessary bind-address option. We do introduce a new MySQLClient profile which will hold all this more client-specific configuration so that this change can fit better in the composable roles work. Also, in the future it might contain the necessary configuration for SSL for example. Note that in case the /etc/my.cnf.d/tripleo.cnf file does not exist (because it is created via the mysqlclient profile), things keep on working as usual and the bind-address option simply won't be set, which has no impact on hosts where there are no VIPs. Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com> Change-Id: Ieac33efe38f32e949fd89545eb1cd8e0fe114a12 Related-Bug: #1643487 Closes-Bug: #1663181 Closes-Bug: #1664524 Depends-On: Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18 (cherry picked from commit 90431683b5927abb066d7964d513828b5488001c)
2017-02-17Merge "Apply puppet in non-controller script in step." into stable/ocataJenkins1-0/+1
2017-02-17Merge "Automatically backup and restore Swift rings from the undercloud" ↵Jenkins1-0/+18
into stable/ocata
2017-02-17Apply puppet in non-controller script in step.Sofer Athlan-Guyot1-0/+1
We want to apply a puppet manifest for the non-controller role, but we need to apply it in stages. By loading the proper hieradata we get the needed step configuration. Change-Id: I07bfeee7b7d9a9b8c2c20e5d5c9ed735d0bfc842 Closes-Bug: #1664304 (cherry picked from commit 237cd2004a2c0869d60d0e11e9dccd59e809ff90)
2017-02-17Automatically backup and restore Swift rings from the undercloudChristian Schwede1-0/+18
Swift rings created or updated on the overcloud nodes will now be stored on the undercloud at the end of the deployment. An additional consistency check is executed before storing them, ensuring all rings within the cluster are identical. These rings will be retrieved (before Puppet runs) by every node when an UPDATE is executed, and by doing this will be in a consistent state across the cluster. This makes it possible to add, remove or replace nodes in an existing cluster without manual operator interaction. Closes-Bug: 1609421 Depends-On: Ic3da38cffdd993c768bdb137c17d625dff1aa372 Change-Id: I758179182265da5160c06bb95f4c6258dc0edcd6 (cherry picked from commit b323f8a16035549d84cdec4718380bde3d23d6c3)
2017-02-17Add Newton to Ocata UpgradeInitCommonCommandmarios6-1/+54
This adds the UpgradeInitCommonCommand for newton..ocata common UpgradeInit commands. This comes before the ansible upgrade steps so we need to do things like remove the old newton hieradata and install the ansible-pacemaker module and ansible heat-agent plugin This defaults to '' and is set in the major-upgrade-composable-steps and unset in the major-upgrade-converge environment files. Change-Id: I0c7a32194c0069b63a501a913c17907b47c9cc16 (cherry picked from commit 01a91d37199f592aa4273e3847eb1f4f1d27da02)
2017-02-16Merge "Configuring a default ntp server."Jenkins1-2/+4
2017-02-16Merge "Remove unused nova_url from neutron config"Jenkins1-2/+0
2017-02-16Merge "Remove deprecated metering_secret"Jenkins1-1/+0
2017-02-16Merge "OVN bridge mappings for tripleo"Jenkins1-0/+11
2017-02-15Merge "Add nova service support for composable upgrades"Jenkins9-5/+161
2017-02-15Merge "OVN plugin configuration fixes"Jenkins2-10/+23
2017-02-14Add nova service support for composable upgradesSteven Hardy9-5/+161
Co-Authored-By: Mathieu Bultel <mbultel@redhat.com> Co-Authored-By: Oliver Walsh <owalsh@redhat.com> Change-Id: Iafad800a6819d7e75fdaab60d328999d3d3c037f Partially-Implements: blueprint overcloud-upgrades-per-service Related-Bug: #1662344
2017-02-14Merge "Reduce memcached memory configuration"Jenkins1-0/+7
2017-02-14Merge "Add upgrade tasks for opstools services"Jenkins3-0/+27
2017-02-14OVN bridge mappings for tripleoBabu Shanmugam1-0/+11
This patch adds an additional configuration setting for OVN bridge mappings Co-authored-by: Numan Siddique <nusiddiq@redhat.com> Change-Id: I99f2c0c8e633e63273e2469d95fbabbbc665c87c Depends-On: Ia6d66fa954571328c0ac3542af17303def382c1a
2017-02-14Add upgrade tasks for opstools servicesMartin Mágr3-0/+27
This patch adds upgrade tasks for sensu-client, fluentd and collectd Change-Id: I3a8096159664b1934b34f6c79b8afb4a3dc645c8
2017-02-14Configuring a default ntp server.Carlos Camacho1-2/+4
Adding a default NTP server by default will keep all Pacemaker and non-Pacemaker deployments aligned with the same server by default. Also useful for keeping time diff controlled for Keystone and Ceph. Change-Id: I8a26bae15cbfb83e3abd6b9ef9d12b57467e6258
2017-02-14Use Keystone internal endpoint instead of admin for nova-ironicGiulio Fidente1-4/+4
As per I1213a83ef8693c1cca1d20de974f7949a801d9f1 this moves to using KeystoneInternal for the nova-ironic template and updates some deprecated hiera keys. Change-Id: Ib1103c00ddb7d6d624f4911147197d8355a3a6dd
2017-02-14Use Keystone internal endpoint instead of admin for servicesJuan Antonio Osorio Robles23-24/+24
The admin endpoint is listening on the ctlplane network by default; services should ideally be using the internal api network for this kind of traffic, as the ctlplane network is mostly for provisioning. On the other hand, the admin endpoint shouldn't be as relevant with services switching to keystone v3. Change-Id: I1213a83ef8693c1cca1d20de974f7949a801d9f1
2017-02-14Merge "Configure the placement API's interface to use the internal endpoint"Jenkins1-0/+6
2017-02-13Merge "Enables support for configuring Cinder with Dell EMC ScaleIO storage ↵Jenkins1-0/+111
backend."
2017-02-13Merge "nova-placement: support upgrade"Jenkins1-0/+4
2017-02-13Merge "placement: switch service to use NovaPlacementNetwork"Jenkins1-2/+2
2017-02-13Merge "Remove [heat,glance,ironic,cinder,keystone] db sync from ansible"Jenkins5-15/+0
2017-02-13Merge "Fix Neutron region in nova.conf"Jenkins1-0/+1
2017-02-13nova-placement: support upgradeEmilien Macchi1-0/+4
Upgrade nova-placement service with Ansible. Change-Id: I43cac37afbc8b39708389895d9f7350b6bd4bcfd
2017-02-13Remove [heat,glance,ironic,cinder,keystone] db sync from ansiblemarios5-15/+0
These are handle by puppet as usual (puppet run comes after the ansible steps) so remove them from these remaining upgrade_tasks Change-Id: Ic341f31251622ccb11a5f7818b2edf7a82391560
2017-02-13Remove the ansible neutron-api db sync as for other servicesmarios1-3/+0
In line with other service we leave the db sync to puppet unless needed for some workaround/upgrade related reason. Change-Id: I9ae463cda19ffdd66f9ccbae40e85551841ab938
2017-02-13Configure the placement API's interface to use the internal endpointJuan Antonio Osorio Robles1-0/+6
Due to the keystoneauth library's defaults, it uses the public interface currently. This is not desirable in most cases (specially when using network isolation); so we set it to use the internal one. Change-Id: Ic222a2b734f4d512349fd8556aa2864b13a1eb07 Depends-On: I1c7fd3a32d04e2fafb3820d1c1f221f45c613c83 Closes-Bug: #1663187
2017-02-12Merge "adding Congress Support"Jenkins1-0/+90
2017-02-12Reduce memcached memory configurationAlex Schultz1-0/+7
Previously the memcached configuration was set to use the defaults which would be 95% of the avaiable ram in the system. This can lead to memory contention issues if memcache is heavily utilized. This change reduces the default to 50% and exposes the ability to tune this configuration. Change-Id: Ie8a48ff4cf509e93d7c1487813d5feed5e5131a4 Closes-Bug: #1662941