Commit Graph

55 Commits

Author SHA1 Message Date
Carlos Camacho
258c6ce52d Merge pre|post puppet resources into pre|post config.
The [Pre|Post]Puppet resources were renamed in
https://review.openstack.org/#/c/365763.
This was intended for having a pre/post deployment
steps using an agnostic name instead of
being attached to a technology.

The renaming was unintentionally reverted in
https://review.openstack.org/#/c/393644/ and
https://review.openstack.org/#/c/434451.

This submission merge both resources into one,
and remove the old pre|post hooks.

Closes-bug: #1669756
Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
2017-04-24 12:56:49 +02:00
Michele Baldessari
cf8c1ebdd3 pacemaker remote profile support
This adds a pacemaker_remote puppet service so that an operator
can automatically deploy pacemaker-remote on nodes of his choice.

Change-Id: I9678606b3de9b9f4c03014b33c1dd27fcba67513
Depends-On: I581552dfa64160e2f82f6a9b8f2ae521c3d6da8d
Depends-On: I92953afcc7d536d387381f08164cae8b52f41605
2017-01-24 12:18:14 +01:00
Giulio Fidente
4b8720e6c1 Remove old ControllerConfig override from puppet-pacemaker.yaml
Previously we had to override the location of the manifest file
pushed on the controller nodes when deploying with Pacemaker, this is
not needed anymore with composable roles.

Change-Id: I1e010099263a325d06483f498c70582b008c31e2
2017-01-03 19:45:43 +01:00
Steven Hardy
0f742c7ec9 Disable keepalived for HA deployments via t-h-t
Currently this is disabled via a conditional in the keepalived
profile in puppet-tripleo, but this will be incompatible with
the planned composable upgrades implementation.  Instead we should
disable the service template by mapping to OS::Heat::None, and
ensure the haproxy manifest uses the t-h-t generated hiera value
keepalived_enabled instead of hard-coding a hiera override in the
haproxy template.

Change-Id: I85a8b1cca7268506de22adfb3a8ce7faa4f157ef
Partial-Bug: #1642936
Depends-On: I90faf51881bd05920067c1e1d82baf5d7586af23
2016-11-18 11:45:57 +00:00
Jenkins
fab494ed4a Merge "Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml" 2016-08-19 14:19:58 +00:00
Giulio Fidente
9b739012b7 Disable cinder-backup by default
The cinder-backup service was not configured in mitaka, so
having it disabled by default does not change the existing
behavior.

Also adds an environment file to enable it in the pacemaker
scenario.

Change-Id: I9a238e0d4601c9f59aff94fdac837c7d0e90afa0
2016-08-19 12:06:37 +02:00
Carlos Camacho
ccc0079965 Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml
Already with the same value in overcloud-resource-registry-puppet.yaml

Change-Id: Ic274abddef5e229a3517f4f77d8192d6abf81044
2016-08-18 14:52:30 +02:00
Michele Baldessari
d923556a05 Make sahara run via systemd
Via commit 0327fc2bbb we added sahara
as a composable service. Let's make sure sahara-api and sahara-engine
run via systemd and not as a pacemaker resource. This is inline with the
HA NG spec.

Change-Id: I5634ad43771fba798892df6d2297c2634dcb6756
2016-08-17 16:08:37 +02:00
Erno Kuvaja
75110de9dd Add cinder-backup service as role
Tempest tests for cinder contain backup tests that fail
unless cinder-backup service is started. This patch facilitates
the service start upon the overcloud deployment.

Original patch converted to composable role.

Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Depends-On: Ib1dfe52b83ab01819fc669312967950e75d8ddf1
Change-Id: I9ca97b3f1c26aac6d81b3525377e1f5fb962313f
2016-08-10 19:02:08 +00:00
Steven Hardy
0327fc2bbb Add Sahara services to ControllerServices list
https://review.openstack.org/#/c/318840/ decomposed the Sahara services
but they weren't added to the ControllerServices list, thus are now disabled.

Since we shipped mitaka with sahara enabled by default, we should probably add
them so the behavior is consistent when folks upgrade.

This also fixes a couple of issues we missed when landing the initial service
templates (partly because CI didn't test them).

In order for each service to operate independently when used with Pacemaker,
the roles needed to be separated. This commit also does this.

Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1
Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c
Closes-Bug: #1592284
Co-Authored-By: Brad P. Crochet <brad@redhat.com>
2016-08-06 10:45:31 +02:00
Michele Baldessari
81de065665 Next generation HA architecture work
This is the THT part that brings us the next generation architecture
as described in the following spec:
https://review.openstack.org/#/c/299628/

Blueprint:
https://blueprints.launchpad.net/tripleo/+spec/ha-lightweight-architecture

So far we tested deployment + tripleo.sh --overcloud-pingtest and
failover + tripleo.sh --overcloud-pingtest

Note that many of the Pacemaker template files become redundant with
this change, but to simplify the process of getting this change landed,
those templates will not be removed until a future commit.

Depends-On: I5e7585c08675d8a4bd071523b94210d325d79b59

Change-Id: I00bccb2563c006f80baed623b64f1e17af20dd4e
Implements: blueprint ha-lightweight-architecture
Co-Author: cmsj@tenshu.net
2016-08-04 15:07:39 +02:00
Ryan Hefner
b99733d08a Enable Manila integration - as a composable controller service
Allows the installation and configuration of Manila.
Supports the generic driver only. This has a dependency on the
puppet-tripleo classes for manila where the puppet specific
config now lives.

The review at https://review.openstack.org/#/c/315658/ has been
merge into this one, as of v68, so manila lands as a composable
service. This was brought up on the mailing list at [1]

[1] http://lists.openstack.org/pipermail/openstack-dev/2016-May/096126.html

Co-Authored-By: Marios Andreou <marios@redhat.com>
Implements: blueprint composable-services-within-roles
Depends-On: I444916d60a67bf730bf4089323dba1c1429e2e71
Depends-On: I9eda4b3364e5c59342761a1ec71b0eb567c69cf1
Depends-On: I571b65a5402c1028418476a573ebeb9450ed00c9
Change-Id: I7acebac4354fca1f8d7ff6c343c1346bf29b81c6
2016-08-02 17:18:07 +03:00
Jenkins
03732f871b Merge "Allow to manually disable post-puppet restarts" 2016-07-28 13:59:11 +00:00
Giulio Fidente
b0e53995ec Create role for the fake openstack-core resource
Change-Id: Iacd94294b8a66bc082bb2b3e8d3364ec1bf053b8
Depends-On: I16a786ce167c57848551c7245f4344c382c55b3d
2016-07-27 22:58:01 +02:00
Emilien Macchi
1d38b75367 Deploy Horizon with composable apache service
Deploy Horizon with composable apache service and don't include:
::tripleo::profile::pacemaker::apache

Because it's already included in the profiles in puppet-tripleo.

Change-Id: I5382d5cc95ba10805019142a9a223dbd4a4b8074
Depends-On: Id28c618133e53e28dfac7e3e9cf9f5f5a6b2421a
2016-07-21 13:41:14 +00:00
Emilien Macchi
6a629a4dcc Move MySQL Galera within composable services
This patch just moves the Puppet code into puppet-tripleo.
A future iteration will be to move parameters within the service
template.

Closes-Bug: #1601853
Depends-On: I7ddae28a6affd55c5bffc15d72226a18c708850e
Change-Id: I51a05dbf53f516b200c146b35529ce563ce9ac7b
2016-07-14 08:59:40 -04:00
Emilien Macchi
d91bb38e1d Composable Pacemaker service
Deploy Pacemaker using composable services.

Change-Id: I038514812af5a9f30260a81ea3366d46bee4ee4e
Depends-On: I46215f82480854b5e04aef1ac1609dd99455181b
Closes-Bug: #1601970
2016-07-13 13:19:34 +00:00
Pradeep Kilambi
0415a2a82b Gnocchi composable roles
Implements: blueprint composable-services-within-roles

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com>

Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d

Closes-Bug: #1601846
Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9
2016-07-12 14:14:24 +02:00
Emilien Macchi
81863d1014 Re-enable Ceilometer composable roles for controller
This patch brings back Ceilometer composable roles for controller,
module some adjustments to make it work.

Fixes 3 issues in Ceilometer composable services

1) This patch fixes the hiera maps in the pacemaker ceilometer*
templates. These were lists and should be a map.

2) fixes a critical issue in ceilometer-base.yaml where the
password was incorrectly coded in the YAML using get_param on
a string which wasn't actually a parameter.

3) Fixes the ceilometer_coordination_url so that it uses a YAML anchor
as was implied instead of get_param on a string which wasn't a
parameter.

4) Fixes the default database connection to use mongodb and configured
in puppet-tripleo profile appropriately.

Co-Authored-By: Dan Prince <dprince@redhat.com>
Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com>

Closes-Bug: #1601844
Change-Id: Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
2016-07-11 11:00:36 -04:00
Dan Prince
800ee92b75 Composable Midonet for Neutron
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093

Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590
Partially-implements: blueprint composable-services-within-roles
2016-07-08 14:44:05 +00:00
Dan Prince
c93ba28a89 Revert "Ceilometer composable roles for controller"
This reverts commit c48410a05e.

We've discovered this patch never had passing CI due to a DLRN
build failure.

Change-Id: I546cb3e340d20701662affda7e28b586c58ba6de
2016-06-23 14:38:56 -04:00
Jenkins
e8fdaf13de Merge "Ceilometer composable roles for controller" 2016-06-23 05:57:11 +00:00
Pradeep Kilambi
c48410a05e Ceilometer composable roles for controller
Depends-On: I4b5e93a108e80e91af26ffee454130ee18c0042e

Change-Id: I59c948ead475f449cb8d1b752f39b7eaaf056130
2016-06-23 03:06:03 +00:00
Dan Prince
37bb689a0f Composable opencontrail plugin
Partially-implements: blueprint composable-services-within-roles

Change-Id: I17ac5dc2a6fb82a82d1db039e61fc8e87ba88333
2016-06-16 15:04:25 -04:00
Dan Prince
9e502fc07d Composable neutron nuage plugin
Partially-implements: blueprint composable-services-within-roles

Depends-On: Ia4a297008b259a8e238bd1ad511e82f4e5ab6d63
Change-Id: I80ac1a5393a17d4cf997cd3ef060574455d1b5ec
2016-06-16 15:04:25 -04:00
Jenkins
07586ca090 Merge "Composable Neutron Plumgrid plugin" 2016-06-15 05:20:12 +00:00
Jiri Stransky
f918bdb048 Allow to manually disable post-puppet restarts
Restarting services after Puppet is vital to ensure that config changes
go applied. However, it can be sometimes desirable to prevent these
restarts to avoid downtime, if the operator is sure that no config
changes need applying. This can be a case e.g. when scaling compute
nodes. Passing the puppet-pacemaker-no-restart.yaml environment file *in
addition* to puppet-pacemaker.yaml should allow this.

This is a stop gap solution before we have proper communication between
Puppet and Pacemaker to allow selective restarts.

Change-Id: I9c3c5c10ed6ecd5489a59d7e320c3c69af9e19f4
2016-06-14 16:10:10 +02:00
Emilien Macchi
16d0489291 Enable nova-vncproxy as a composable service
Implement NovaVncproxy service using nova-base for common
meters.

Change-Id: I6463cad5aa722d8c8febac1414d03637d6daec37
Depends-On: I5bc2a77b5832706bd9167cf40e5a7e0f95d7b346
Implements: blueprint composable-services-within-roles
2016-06-14 12:00:56 +03:00
Emilien Macchi
80ad670ad8 Enable nova-consoleauth as a composable service
Implement NovaConsoleauth service using nova-base for common
meters.

Depends-On: I955b4fc07dc07d8adc32411848e3e131d77a5123
Implements: blueprint composable-services-within-roles
Change-Id: I7248f9c0a7a575675a2c2551ca9f8f51290a6656
2016-06-14 12:00:56 +03:00
Emilien Macchi
94bf2d5a0c Enable nova-scheduler as a composable service
Implement NovaScheduler service using nova-base for common parameters.

Depends-On: I5e1c90e3c6dc556f872ced73744c5c74caaa3635
Change-Id: Ie50716a09c53d656835b16991128c94b35cf1ed2
Implements: blueprint composable-services-within-roles
2016-06-14 12:00:56 +03:00
Emilien Macchi
27ee21d9bd Enable nova-api as a composable service
Implement NovaApi service using nova-base for common parameters.

Change-Id: Ibcb89b332ab73f18d05e5b2e454964e322b982e6
Implements: blueprint composable-services-within-roles
Depends-On: I1dde63a5a7d1624494a7157a9679f88f4cb780e0
2016-06-14 12:00:56 +03:00
Dan Prince
cf04308ee5 Composable Neutron Plumgrid plugin
Partially-implements: blueprint composable-services-within-roles

Depends-On: I8536782d433f97a9b619e54a1eb1ea0edb8fdaf0
Change-Id: I3309997413998f1d90117e361d1578da3633e56c
2016-06-13 21:57:58 -04:00
Carlos Camacho
11074fb08f Composable roles within services - MongoDB
Add MongoDB as a composable service.

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Change-Id: Idaa3275def3bcdb302a66fc1c88531ff718bcf67
Depends-On: Idb1e78ebec7682fe68ca5902a22cfb6030498091
2016-06-12 21:25:39 +00:00
Dan Prince
89fbd07afe composable neutron ml2 and ovs agent
Adds new puppet and puppet pacemaker specific services for
the Neutron ml2 configuration and the Ovs agent.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07
2016-06-09 10:45:30 -04:00
Dan Prince
08a201e238 composable neutron server
Adds new puppet and puppet pacemaker specific services for
the Neutron server configuration.

Depends-On: I52815f45a04bf3e39940b9cb116261730580a3e2

Partially-implements: blueprint composable-services-within-roles

Change-Id: I1680d4b7044f16d672e99ca356d954b6734af287
2016-06-09 10:44:58 -04:00
Jenkins
eef24da485 Merge "Explode Loadbalancer role into HAproxy + keepalived" 2016-06-06 13:59:18 +00:00
Emilien Macchi
3d01f650f1 Enable nova-conductor as a composable service
Implement NovaConductor service using nova-base for common parameters.

* Move rabbitmq parameters from controller.yaml to nova-base service, as
  an example. More parameters will move in the future.
* Move nova-conductor bits from monolithic manifests to the new service
  using new profiles from puppet-tripleo.

Depends-On: Iaaf3a3c2528d9747e41f360a1fe55f95ed37b2d1
Implements: blueprint composable-services-within-roles

Change-Id: I178f092b74ae12f2cb6f006db7cb00e4d6bddfd8
2016-06-06 12:47:19 +00:00
Emilien Macchi
244dcc4349 Explode Loadbalancer role into HAproxy + keepalived
Split Loadbalancer into HAproxy & Keepalived roles.

Depends-On: I8aa9045fc80205485abab723968b26084f60bf71
Change-Id: If2723358099e78052c351a4a45fdf01d116a89df
2016-06-04 03:45:14 +00:00
Jenkins
dc50786206 Merge "Composable roles within services - Redis" 2016-06-04 03:34:51 +00:00
Giulio Fidente
27e457e0dd Switch Cinder Api/Scheduler/Volume to composable roles
Uses a shared cinder-base resource to do the database
and messaging configuration for all three services.

Depends-On: I3c6d5226eed5f0f852b0ad9476c7cd9a959fda69
Change-Id: I47c5fd190efca5f02e73fd22aba6cda573daf5cc
2016-06-02 12:21:49 -04:00
Pradeep Kilambi
31c4167d86 Composable roles within services - Redis
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com>

Change-Id: I0d9332f7f4f9116c5435d338a9c35d4fb3f512c6
Implements: blueprint composable-services-within-roles
Depends-On: I60493a3aa64e5136b763e8e2084d728f5f812f8a
2016-06-02 17:26:01 +02:00
Jenkins
e1d3c42ae9 Merge "composable heat services" 2016-05-26 12:26:54 +00:00
marios
565f0c509d Adds memcached as a composable service
Implements: blueprint composable-services-within-roles
Depends-On: Icd504aef7dda144582c286c56c925a78566af72c
Change-Id: I8802c2a0cf1e5fa1a6d1fab5e87f6014bea2f517
2016-05-20 10:16:08 +03:00
Brad P. Crochet
d18f21853e composable heat services
Adds new puppet and puppet pacemaker specific services for
Heat API, Heat API CFN, Heat API Cloudwatch, and Heat Engine.

The Pacemaker templates extend the default heat services and
swap in the pacemaker specific puppet-tripleo profile instead.

Change-Id: I387b6bfd763d2d86cad68a3119b0edd0caa237b0
Partially-implements: blueprint composable-services-within-roles
Depends-On: I194cbb6aa307c2331597147545cf10299cab132f
Depends-On: I14dc923ac8ee8d5d538e7f4cf8138ccee8805b53
2016-05-19 10:22:19 -04:00
Emilien Macchi
40ad289910 Deploy Loadbalancer as a composable role
Deploy loadbalancer service using puppet-tripleo, and drop puppet code.

Implements: blueprint refactor-puppet-manifests
Depends-On: I9b106dcc1a4d446ab5dea8430ed295e6ec209cbd

Change-Id: I9ca50a4bc822ec17d89988894af9bdf07e4bd1a9
2016-05-19 11:16:25 +02:00
Emilien Macchi
5b95df3ee3 Deploy RabbitMQ as a composable role
Change the way to implement RabbitMQ, as a composable role.

Implements: blueprint refactor-puppet-manifests
Change-Id: I5fed5c437ad492af75791a9163f99ae292f58895
2016-05-18 21:43:31 +02:00
Dan Prince
168bc2f6ff composable neutron metadata service
Adds new puppet and puppet pacemaker specific services for
the Neutron Metadata agent.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I25f026507e78f18594599b3621613a54f246545d
2016-05-18 08:26:09 -04:00
Dan Prince
59e2f29fd1 composable neutron l3 service
Adds new puppet and puppet pacemaker specific services for
the Neutron L3 agent.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I0316043efe357a41ef3b4088a55d98dbb6d25963
2016-05-18 08:25:00 -04:00
Dan Prince
27f7d220bd composable neutron dhcp service
Adds new puppet and puppet pacemaker specific services for
the Neutron DHCP agent.

Depends-On: Ibbfd79421f871e41f870745a593cca65e8c0e58a

Partially-implements: blueprint composable-services-within-roles

Change-Id: Ia61295943e67efe354a51a26fe4540f288ff6ede
2016-05-10 21:52:01 -04:00
Dan Prince
7588f74919 composable glance services
Adds new puppet and puppet pacemaker specific services for
Glance API and Glance Registry.

The Pacemaker templates extend the default glance services and
swap in the pacemaker specific puppet-tripleo profile instead.
In the case of pacemaker glance-registry there is no separate
puppet manifest so only the configuration parameters are maintained
there. (Due to the way the pacemaker glance constraints are written
the pacemaker varients of this service can't be split out...)

Depends-On: Ifc388f7058ccfff2818f531bcbc00c7179874bbc
Change-Id: I00a8c916129af43cda225754eb10370289bb4b41
2016-04-21 01:03:51 +00:00