aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2017-02-10Merge "Add pacemaker composable upgrade steps"Jenkins1-0/+15
2017-02-10Merge "Remove aodh db sync from ansible upgrade"Jenkins1-3/+0
2017-02-10Dump and run puppet for role which are disable_upgrade_deployment trueMathieu Bultel1-0/+28
We wants to run puppet on each role which has the flag disable_upgrade_deployment to true. It will run after the upgrade of the role and before running the whole converge step. Change-Id: Ia85be688d070dfb5b8337e8ef3c4bc439fb6052e
2017-02-10adding Congress SupportDan Radez1-0/+90
Depends-On: Ic74ccd5fa7b3b04ca810416e5160463252f17474 Implements: blueprint congress-service-integration Change-Id: Ie60540c340c0eb71ff376aba65507a8bb3e909b6 Signed-off-by: Dan Radez <dradez@redhat.com>
2017-02-10Delivers upgrade scripts where upgrade steps are disabledmarios2-2/+67
This delivers a /root/tripleo_upgrade_node.sh to those nodes that have the disable_upgrade_deployment flag set to true. They will later be upgraded manually by the operator who will invoke the script delivered here using upgrade-non-controller.sh We can also deliver any service specific upgrade configuration, such as configuring nova-compute to use the placement API as this is required in order for placement to be configured and installed during the subsequent upgrade steps for controller services. This removes the compute and swift specific upgrade scripts as they are now merged into the common tripleo_upgrade_node.sh - removing any hard coded reference to a particular role name (compute/objectstorage) and only relying on the disable_upgrade_deployment is roles_data.yaml Change-Id: I4531a4038b78087ef4a1a62c35f1328822427817 Co-Authored-By: Mathieu Bultel <mbultel@redhat.com>
2017-02-10Make UpgradeBatch resource depends on BatchConfig step0Mathieu Bultel1-26/+18
Make UpgradeBatch depends on BatchConfig, for step0 avoid creation of the UpgradeBatchConfig_stepX prior to UpgradeBatchConfig step0 and add condition Change-Id: I852beee65590270422cfbc9abe02111d88442f2e
2017-02-10Remove aodh db sync from ansible upgradeMathieu Bultel1-3/+0
The db sync won't be run by ansible but by puppet as part of the converge step Change-Id: Ie868a92ece020e5749a401e0897be5ab80f13559
2017-02-09Adding Tacker SupportDan Radez1-0/+91
Depends-On: Ide0e60f3b7a3733788af4337c1c39b4a956c876f Depends-On: I3d6bbc05644e840395f87333ec80e3b844f69903 Depends-On: Idf6abcb7fe766546cb362ad4afe54f4bccd9c994 Implements: blueprint tacker-service-integration Change-Id: Ibddc81561f6e6ba671bd01a9251c57d3ad67ba8c Signed-off-by: Dan Radez <dradez@redhat.com>
2017-02-09Merge "Re-organizes Contrail services to the correct roles"Jenkins14-296/+344
2017-02-08Remove deprecated metering_secretPradeep Kilambi1-1/+0
use telemetry_secret instead which is already set. Change-Id: I1815ba16519a529c6b7cbdf164e8853857692d73
2017-02-08Re-organizes Contrail services to the correct rolesMichael Henkel14-296/+344
In current setup some Contrail services belong to the wrong roles. The Contrail control plane can be impacted if the Analytics database has problems. Change-Id: I0d57a2324c38b5b20cc687c6217a7a364941f7e6 Depends-On: Id0dd35b95c5fe9d0fcc1e16c4b7d6cc601f10818 Closes-Bug: #1659560
2017-02-08Merge "Remove openstack-ceilometer-expirer check"Jenkins1-4/+0
2017-02-08Merge "Composable service support for Cinder Dell EMC Storage Center"Jenkins3-88/+85
2017-02-08Merge "implement a collectd composable service"Jenkins3-0/+124
2017-02-07Merge "Add registry and role service list entries for Octavia"Jenkins1-1/+3
2017-02-07Merge "Stop deploying Nova API in WSGI with Apache"Jenkins1-20/+31
2017-02-07Merge "Introduce Octavia implementation services"Jenkins3-0/+233
2017-02-07Merge "Stop setting bind_address on nova db uri."Jenkins1-6/+0
2017-02-07Stop deploying Nova API in WSGI with ApacheEmilien Macchi1-20/+31
It was suggested by Nova team to not deploying Nova API in WSGI with Apache in production. It's causing some issues that we didn't catch until now (see in the bug report). Until we figure out what was wrong, let's disable it so we can move forward in the upgrade process. Change-Id: I09b73476762593642a0e011f83f0233de68f2c33 Related-Bug: 1661360
2017-02-07Enables support for configuring Cinder with Dell EMCrajinir1-0/+111
ScaleIO storage backend. This change adds all relevant parameters for: - Dell EMC ScaleIO Block Storage driver configuration Closes-Bug: #1661316 Depends-On: I5534aab53b70de215336a076d25263c73b8d7b5b Change-Id: I8927151adbce235595a5c62365e1f87a6503c462
2017-02-07Stop setting bind_address on nova db uri.Oliver Walsh1-6/+0
This reverts the changes in https://review.openstack.org/414629 for nova as they are incompatible with cell_v2. This is a temporary fix for HA while a long-term solution is developed. Change-Id: I79d30a2d76a354999152c0c997ea77f104c51027 Related-bug: #1643487 Closes-bug: #1662344
2017-02-07Composable services support for Cinder Dell EMC PS Seriesrajinir3-87/+85
Updated the heat templates for Cinder Dell EMC PS Series backend to use composable services and rebranding of EQLX to Dell EMC PS Series Closes-Bug: #1661313 Change-Id: Id9d6f172f3f79a31788b26c7776d738fda5a30fa
2017-02-07implement a collectd composable serviceLars Kellogg-Stedman3-0/+124
The collectd composable service permits an operator to configure collectd metrics collection as part of the overcloud install. Depends-on: I03cfbd96778a76125d18e2ca2f48d96e292608de Change-Id: I143565329f5128f15cc39c9b62a6b242666383ab
2017-02-07Merge "Adds default Keystone region to regionOne Closes-Bug: #1661839"Jenkins1-0/+5
2017-02-06Merge "Remove openstack-ceilometer-api pre upgrade check"Jenkins1-3/+0
2017-02-06Merge "Remove precheck on services which run on httpd for upgrade"Jenkins2-6/+0
2017-02-06Merge "Remove old host param"Jenkins1-6/+0
2017-02-06Remove precheck on services which run on httpd for upgradeMathieu Bultel2-6/+0
Those services is not handle with systemctl Change-Id: Ia57dffd42a11070696fda14f1e91de2993e63479
2017-02-06Remove openstack-ceilometer-api pre upgrade checkMarius Cornea1-3/+0
This change removes the pre upgrade check for a running openstack-ceilometer-api service as this service doesn't exists in Newton. Ceilometer API runs under httpd: [root@overcloud-controller-0 ~]# httpd -t -D DUMP_VHOSTS | grep ceilo 10.0.0.23:8777 overcloud-controller-0.internalapi.localdomain (/etc/httpd/conf.d/10-ceilometer_wsgi.conf:6) Change-Id: I5cbf8ccf72f9071e328f52d373cf9e8edf5793f4 Closes-Bug: 1661251
2017-02-06Automatically 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
2017-02-06Merge "Provide a default value for Ironic cleaning_network configuration"Jenkins1-0/+9
2017-02-04Adds default Keystone region to regionOneRamon Acedo1-0/+5
Closes-Bug: #1661839 Change-Id: I9498be04749dc866d0423e75e57d4c07eaf3e904
2017-02-03Merge "Disable batch upgrade deployments for disabled roles"Jenkins1-43/+44
2017-02-03Merge "Reduce number of steps for upgrades"Jenkins3-14/+16
2017-02-03Merge "Simplify/fix config enabled conditions for upgrades"Jenkins1-12/+6
2017-02-03Merge "Configure VNC Server listen address through t-h-t"Jenkins1-0/+1
2017-02-03Composable service support for Cinder Dell EMC Storage Centerrajinir3-88/+85
Updated the heat templates for Cinder Dell EMC Storage Center Backend to use composable services Closes-Bug: #1661314 Change-Id: I454549c45da7388f0e42975c9f4637dde9ec51e3
2017-02-03Add registry and role service list entries for OctaviaBrent Eagles1-1/+3
This patch adds the Octavia services to the registry and controller role (disabled by default). Also included is an example environment file for enabling the services and required configuration. The API service profile is also amended configure the load balancer service provider in neutron to point to the octavia load balancer driver. Change-Id: I7f3bba950f5b1574ba842a39e93a8ac2b1ccf7bb Partially-implements: blueprint octavia-service-integration
2017-02-03Provide a default value for Ironic cleaning_network configurationDmitry Tantsur1-0/+9
Ironic will soon refuse to start when at least some value is not provided. Unfortunately, we do not create any overcloud[*] networks during deployment. Fortunately, Ironic does not validate this value until actual cleaning. So, this change sets it to "provisioning", which is what people often use. An update will follow to the documentation to recommend this name: http://tripleo.org/advanced_deployment/baremetal_overcloud.html#configuring-cleaning A new parameter is created for this value, with a reminded to change it to an actual UUID later on. While a pre-defined name will work in a simplest case, in a real multi-tenant deployment a network name conflict is possible. Using a UUID is safer in this regard. [*] networks created in overcloud neutron Change-Id: I1b7dc2ff70d3b76f19a183a60e88cf72f6d2a318 Closes-Bug: #1661082
2017-02-03Remove openstack-ceilometer-expirer checkCarlos Camacho1-4/+0
This wont work as openstack-ceilometer-expirer cant be listed from systemctl. Also we are not runing any upgrade task. i.e.: [root@overcloud-controller-0 ceilometer]# systemctl list-units | grep ceilometer openstack-ceilometer-api.service loaded active running OpenStack ceilometer API service openstack-ceilometer-central.service loaded active running OpenStack ceilometer central agent openstack-ceilometer-collector.service loaded active running OpenStack ceilometer collection service openstack-ceilometer-notification.service loaded active running OpenStack ceilometer notification agent Change-Id: Ia9f7d3744264af1a37c06b9c8878cd95bed4e1c5
2017-02-03Disable batch upgrade deployments for disabled rolesSteven Hardy1-43/+44
Currently we don't correctly disable the batch_upgrade_tasks, so rework the loops to ensure we only create the batch deployments for roles which enabled upgrades. Note this modifies some loop whitespace too which cleans up the rendered output and makes it a bit more readable/compact. Change-Id: I1c257dcc351e99efa54f9cae4b3009287908756e Partially-Renders: blueprint overcloud-upgrades-per-service
2017-02-03Reduce number of steps for upgradesSteven Hardy3-14/+16
We don't need all the steps currently enabled for either batched or concurrent updates, so decrease them. In future we can perhaps introspect the task tags during plan creation and set these dynamically. Change-Id: I0358886a332dfbecd03bc4a67086b08d25756c22 Partially-Implements: blueprint overcloud-upgrades-per-service
2017-02-03Simplify/fix config enabled conditions for upgradesSteven Hardy1-12/+6
We should enable each kind of upgrade per role, not per step so rework the conditions, and also only apply it to the deployment (to save the round-trip to the nodes applying an empty config) but don't disable the *Config resources as the overhead of these is small, and we reference the Step1 config in the outputs, even if it's empty. Change-Id: Iee2f1fb5b1d8b0b6001c6ab0f2a4ef2858cef281 Partially-Implements: blueprint overcloud-upgrades-per-service
2017-02-03Disable puppet on upgrade for roles not upgradingSteven Hardy4-89/+130
Where the role has disabled upgrades, we need to skip both the ansible and puppet steps. To do this we refactor the post.j2.yaml so that it can be included in the upgrade template with an adjusted list of roles. Note this requires https://review.openstack.org/#/c/425220/ - this change will be required for local testing of this patch (run mistral-db-mange populate after updating tripleo-common and restart the mistral services, or update your repos and re-run openstack undercloud install). Partially-Implements: blueprint overcloud-upgrades-per-service Change-Id: Ie7d0fa6fef3528bd93e6cde076b964ea8de3185a
2017-02-02Remove old host paramPradeep Kilambi1-6/+0
Change-Id: Ib9e1a4ccdf447455a330687184eae471b9f3f4d4 Depends-On: I2b48d23006e38f56f04456b4556374bf0fcdb14a
2017-02-02Switch item notation to jinja formatMarius Cornea1-2/+2
This change fixes the item variable notation in puppet/services/ceph-osd.yaml. Change-Id: I4d105619e4ac913b4a711bf91fea5f6e3c9b4caa Closes-Bug: 1661339
2017-02-02OVN plugin configuration fixesBabu Shanmugam2-10/+23
This patch renames certain ovn plugin and controller configuration parameters as well as adds some additional ml2 configuration parameters. It also disables the need for the neutron metadata agent. Co-authored-by: Numan Siddique <nusiddiq@redhat.com> Change-Id: Idc9e7ef4a1b88013bca3eac3c136e4710e38a5c0
2017-02-02Merge "Allow the override of pacemaker::corosync::settle_tries"Jenkins1-0/+7
2017-02-02Add pacemaker composable upgrade stepsMathieu Bultel1-0/+15
This review adds the pacemaker ansible upgrade steps into the pacemaker service manifest. It makes use of the ansible-pacemaker module which for now is at https://github.com/redhat-openstack/ansible-pacemaker Change-Id: I33c798a198046d5f66e6b20f86080a8187dc208b
2017-02-02Merge "Temporary UCSM mapping files should be opened with write mode"Jenkins1-2/+6