2891 Commits

Author SHA1 Message Date
Jenkins
2fdda7897f Merge "Add Select per-network hostnames for service_node_names to role.role.j2.yaml" 2016-10-06 23:24:42 +00:00
John Fulton
b55f6cda6d Specify the Ceph packages to be installed
The puppet-ceph module defaults to 'ceph' but that is a metapacakge
which isn't provided in all repos.

Depends-On: I13462219522386f8740b0d70916a44f3474115e4
Change-Id: Ie55d22301dd22102d471e6002dfcaad4bfadd5f6
Related-Bug: 1629933
2016-10-06 17:25:18 +00:00
Emilien Macchi
7322d60610 Enable firewalling by default on compute nodes
- Move VXLAN and VRRP rules from Neutron Server to the right services.
- Enable Firewall by default on Compute nodes.

Change-Id: I99d172dcedaf6be297aad184cc51fe9f292a57e1
2016-10-06 12:07:35 -04:00
Dan Prince
ddd4d3cd9f Re-enable ManageFirewall by default.
This default setting got lots in the composable roles/services patches.

Re-enable the ManageFirewall setting by default per what we did in
git commit 73c76b867ddc8a23a30b9a3cac4031189d4178c6.

We also fix a typo in neutron-api.yaml so that the firewall rules
matches to service_name. (otherwise it won't get loaded).

Also, drops the environments/manage-firewall.yaml which is
no longer needed if we enable firewall management by default.

Change-Id: Ie198e4efd190131d0722085b10ef77da9005bc1b
Closes-bug: 1629934
2016-10-06 15:08:53 +00:00
Carlos Camacho
e32e2110b8 Add Select per-network hostnames for service_node_names to role.role.j2.yaml
This will wire up the per-network hostnames in the generic role.

Needs to land after https://review.openstack.org/#/c/378764

Partial-Bug: #1626976

Change-Id: I595f35cce03d9f416a1768aa5c349a1bb20b0e19
2016-10-06 12:43:27 +00:00
Jenkins
f9c3481c3e Merge "restore missing fluentd client functionality" 2016-10-06 12:34:31 +00:00
Jenkins
ac3ee795d3 Merge "Add generic template for custom roles." 2016-10-06 12:34:24 +00:00
Jenkins
022c8586a9 Merge "Set proper ceph config path for manila" 2016-10-06 12:31:49 +00:00
Jenkins
2f5fa1ccba Merge "Select per-network hostnames for service_node_names" 2016-10-06 11:56:02 +00:00
Jenkins
54a297fdc9 Merge "Fix OpendaylightApiNetwork key naming" 2016-10-06 09:26:29 +00:00
Martin André
704a78d342 Be more inclusive in insecure registry regex
The regex failed to match the INSECURE_REGISTRY string used in latest
atomic host image due to it expecting a whitespace after
--insecure-registry.

Change-Id: Ib8f288d844b4d94b0f6309bfd04bb05930d8c4c5
2016-10-06 11:14:20 +02:00
Carlos Camacho
8c52f96753 Add generic template for custom roles.
This submission creates a generic template
file to deploy custom roles.

Also adds a file to specify an exclusion role
list in order to avoid not to generate the
template for those roles.

Partial-Bug: #1626976

Depends-On: I6d7247bbb8702eb0ab9bdf133b5ab1c6e8349d98

Change-Id: I3e11c089023b793a5063d9e1714527a3fe2b7458
2016-10-06 02:13:36 +00:00
Tom Barron
273a4499d6 Set proper ceph config path for manila
When deploying manila with cephfs backend,
/etc/manila/manila.conf should define

  cephfs_conf_path = /etc/ceph/ceph.conf

in the cephfs native backend since this is
the conventional path that ceph operators expect
and since we document that path upstream.

Change-Id: I4abf5c33b675b1102413a84d64f4ce23b07b4485
Closes-Bug: 1630777
2016-10-05 17:55:09 -04:00
Jenkins
c3611e0f70 Merge "Open tripleo-heat-templates for Ocata" 2016-10-05 21:47:47 +00:00
Jenkins
5e4a51363b Merge "Adds Environment File for Removing Sahara during M/N upgrade" 2016-10-05 18:01:20 +00:00
Lars Kellogg-Stedman
dd162f42c7 restore missing fluentd client functionality
in the great rebase following the JINJA ALL THE THINGS changes we lost
critical functionality in the fluentd client service.  This review
restores the missing features.

Change-Id: I7c23f16f81e75f3da6a24587b2eb8385b3e920a4
Closes-bug: 1630692
2016-10-05 13:39:06 -04:00
Tim Rozet
78500bc2e6 Renames OpenDaylight to OpenDaylightApi and splits out OVS configuration
This patch modifies the service name to be more appropriately called
"OpenDaylightApi" along side the "OpenDaylightOvs" service used to
configure OpenVSwitch.  It also splits out the OVS configuration for
controller nodes into the composable OpenDaylightOvs service.

Related-Bug: #1629408

Change-Id: I15221401acdfb2a9ef81107b54a8005348f8372f
Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-10-05 12:06:59 -04:00
Steven Hardy
eaa385f3b0 Fix OpendaylightApiNetwork key naming
This captialization won't work with the CamelCase to snake_case
conversion we do, as the required name is opendaylight_api_network

Adds some clarification to the ServiceNetMap description to hopefully
avoid future confusion.

Change-Id: Ife04ee2185e81009ebef55ad521aef799251e002
Closes-Bug: #1629408
2016-10-05 16:59:13 +01:00
Jenkins
ef8bf6379e Merge "Fixing resources path in OpenDaylight" 2016-10-05 14:30:53 +00:00
John Trowbridge
ec282c4136 Open tripleo-heat-templates for Ocata
To avoid pushing an artificial alpha tag, following PBR semver keyword
bumps major version. See http://docs.openstack.org/developer/pbr/#version

Change-Id: Ic47869c96217269806daac9c3c888603e4e5d00a
Sem-Ver: api-break
2016-10-05 10:05:58 -04:00
marios
2e6cc07c1a Adds Environment File for Removing Sahara during M/N upgrade
The default path if the operator does nothing is to keep the
sahara services on mitaka to newton upgrades.

If the operator wishes to remove sahara services then they
need to specify the provided major-upgrade-remove-sahara.yaml
environment file in the stack upgrade commands.

The existing migration to ha arch already removes the constraints
and pcs resource for sahara api/engine so we just need to stop
it from starting again if we want to remove it.

This adds a  KeepSaharaServiceOnUpgrade parameter to determine if
Sahara is disabled from starting up after the controllers are
upgraded (defaults true).

Finally it is worth noting that we default the sahara services
as 'on' during converge here in the resource_registry of the
converge environment file; any subsequent stack updates where
the deployment contains sahara services will need to
include the -e /environments/services/sahara.yaml environment
file.

Related-Bug: 1630247
Change-Id: I59536cae3260e3df52589289b4f63e9ea0129407
2016-10-05 16:32:31 +03:00
Steven Hardy
6a408ff27e Select per-network hostnames for service_node_names
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Depends-On: Ic6fec1057439ed9122d44ef294be890d3ff8a8ee
Change-Id: I754c4a41d8a294a4c7c18bd282ae014efd4b9b16
Closes-Bug: #1628521
2016-10-05 16:24:54 +03:00
Steven Hardy
ff86a856a6 j2 template per-role ServiceNetMapDefaults
The *HostnameResolveNetwork should default to a sane value
for all roles, including those specified by the user.

We choose internal_api by default (maintaining the existing
special-case for the CephStorage role which uses the storage
network), but users can of course override the default with
a network of their choice.

Change-Id: Ib240f56c1db5842b953fa510316e75fd53f24735
Closes-Bug: #1629827
2016-10-05 08:54:08 +01:00
Jenkins
0e842bb82c Merge "Move the main template files for defalut services to new syntax generation" 2016-10-05 03:06:17 +00:00
Jenkins
525e41d4a7 Merge "j2 template role config templates" 2016-10-04 21:40:13 +00:00
Carlos Camacho
883addf267 Move the main template files for defalut services to new syntax generation
When generating these templates, we should
create them with the "-role" appended as they will
be generated from a role.role.j2.yaml file.

i.e. role.role.j2.yaml will generate <service>-role.yaml
     config.role.j2.yaml will generate <service>-config.yaml

Partial-Bug: #1626976
Change-Id: I614dc462fd7fc088b67634d489d8e7b68e7d4ab1
2016-10-04 20:15:33 +00:00
Dan Prince
3fa2ab420c Include redis/mongo hiera when using pacemaker
This patch updates the pacemaker composable service templates for
mongo and redis to extend the proper base (redis.yaml and mongo.yaml)
templates instead of the -base.yaml versions. This was causing
some missing hiera settings for these services which caused symptoms
like missing firewall rules for these services.

Change-Id: I3f94acbf4d1baadbb151b1c4d34b4a0ab28ad5e5
Partial-bug: #1629934
2016-10-04 10:04:44 -04:00
Jenkins
ccbc75a814 Merge "Use netapp_host_type instead of netapp_eseries_host_type" 2016-10-04 11:00:47 +00:00
Jenkins
81b9392886 Merge "Make keystone api network hiera composable" 2016-10-04 05:18:43 +00:00
Jenkins
575bf581ea Merge "Set ceph osd max object name and namespace len on upgrade when on ext4" 2016-10-04 03:01:11 +00:00
Jenkins
4ad03b75c5 Merge "reload HAProxy config in HA setups when certificate is updated" 2016-10-03 22:19:31 +00:00
Jenkins
5f7d913c10 Merge "Update $service to $resource this variable does not exist in the context" 2016-10-03 18:17:47 +00:00
Jenkins
85fff5d679 Merge "Cinder volume service is not managed by Pacemaker on BlockStorage" 2016-10-03 16:40:41 +00:00
Jenkins
64dc5fabbd Merge "Change the rabbitmq ha policies during an M/N Upgrade" 2016-10-03 16:40:06 +00:00
Mathieu Bultel
dc6f93da4f Update $service to $resource this variable does not exist in the context
heat failed due to a:
service: unbound variable
In the context $service is never set.

Change-Id: If82ee4562612f2617b676732956396278ee40a88
Closes-Bug: #1629903
2016-10-03 17:28:08 +02:00
Juan Antonio Osorio Robles
b74b6793d2 reload HAProxy config in HA setups when certificate is updated
When updating a certificate for HAProxy, we only do a reload of the
configuration on non-HA setups. This means that if we try the same in
an HA setup, the cloud will still serve the old certificate and that
leads to several issues, such as serving a revoked or even a
compromised certificate for some time, or just SSL issues that the
certificate doesn't match. This enables a reload for HA cases too.

Change-Id: Ib8ca2fe91be345ef4324fc8265c45df8108add7a
Closes-Bug: #1629886
2016-10-03 18:20:29 +03:00
Jenkins
935fbd6feb Merge "Fixed NoneType issue when monitoring-environment.yaml" 2016-10-03 09:50:30 +00:00
Jenkins
1bf2b3cc0b Merge "Balance Rabbitmq Queue Master Location on queue declaration with min-masters strategy" 2016-10-03 09:50:23 +00:00
Jenkins
34e10af468 Merge "Change rabbitmq queues HA mode from ha-all to ha-exactly" 2016-10-03 09:50:16 +00:00
Michele Baldessari
1d7231aae2 Change the rabbitmq ha policies during an M/N Upgrade
This takes care of the M->N upgrade path when changing
the ha rabbitmq policy.

Partial-Bug: #1628998

Change-Id: I2468a096b5d7042bc801a742a7a85fb1521c1c02
2016-10-03 10:49:39 +02:00
Jenkins
830ab896e0 Merge "Fixed NoneType issue when logging-environment.yaml is used" 2016-10-03 06:35:07 +00:00
Michele Baldessari
1c5d168544 Change rabbitmq queues HA mode from ha-all to ha-exactly
It turns out that reducing number of rabbitmq queues in cluster
significantly improves performance of cluster especially in the case of
failover recovery time. Right now the cluster uses ha-all mode for rabbitmq
queues.

It is best to change this to "ha-exactly" mode and reduce the number
of queue copies to ceil(N/2) where N is number of controllers in the
cluster - so in typical scenario of 3 controller It would be 2 by
default.

It does not make much sense to keep the copies of queues over whole
cluster since if the quorum of nodes is lost then the rest of cluster
nodes will be stopped anyway. We let the user override this with a
parameter.

I.e. for a 3 node controlplane cluster we will go from this:
pcs resource show rabbitmq
 Resource: rabbitmq (class=ocf provider=heartbeat type=rabbitmq-cluster)
  Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"

To this:
pcs resource show rabbitmq
 Resource: rabbitmq (class=ocf provider=heartbeat type=rabbitmq-cluster)
  Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}"

According to Marin Krcmarik's testing recovery time from failure was
reduced significantly.

Partial-Bug: #1628998
Change-Id: Iace6daf27a76cb8ef1050ada0de7ff1f530916c6
2016-10-01 00:28:34 +02:00
Jenkins
7ac30a97c4 Merge "telemetry: remove coordination_url hiera settings" 2016-09-30 18:54:57 +00:00
Jenkins
fa69c44b28 Merge "Telemetry: add redis_password hiera parameter" 2016-09-30 18:52:04 +00:00
Jenkins
07819ffc06 Merge "Replace per role manifests with a common role manifest" 2016-09-30 17:44:22 +00:00
Steven Hardy
c947008d9e Make keystone api network hiera composable
These hard-coded references to the Controller role mean that
things won't work if the keystone service is moved to any other
role, so we need to generate the lists dynamically based on the
enabled services for each role.

Change-Id: I5f1250a8a1a38cb3909feeb7d4c1000fd0fabd14
Closes-Bug: #1629096
2016-09-30 16:41:27 +01:00
Steven Hardy
94fddffa6d j2 template role config templates
This means the user won't have to manually specify e.g the
OS::TripleO::ACustomRoleConfig resource manually.

Partial-Bug: 1626976
Change-Id: I063571d4c5cbc2f295a7a044d81c27d703bd0e10
Depends-On: I9f920e191344040a564214f3f9a1147b265e9ff3
2016-09-30 16:37:07 +02:00
Steven Hardy
b3c73a7e99 Replace per role manifests with a common role manifest
This removes the (nearly empty) per role manifests, and
replaces them with a generic manifest, where we use str_replace
to substitute the role name at runtime (or in some cases a
subset of the name for backwards compatibility)

Change-Id: I79da0f523189959b783bbcbb3b0f37be778e02fe
Partial-Bug: #1626976
2016-09-30 14:11:01 +00:00
Emilien Macchi
d720f22925 telemetry: remove coordination_url hiera settings
They are now normalized and set in puppet-tripleo.

Change-Id: I197481c577b85894178e7899a55869da47847755
Closes-Bug: #1629279
Depends-On: Ic6de09acf0d36ca90cc2041c0add1bc2b4a369a5
2016-09-30 09:48:56 -04:00
Emilien Macchi
b97c913f23 Telemetry: add redis_password hiera parameter
Add redis_password parameter in Hiera so we can re-use it from
puppet-tripleo later for Aodh, Ceilometer and Gnocchi.

Change-Id: I038e2bac22e3bfa5047d2e76e23cff664546464d
Partial-Bug: #1629279
2016-09-30 09:44:13 -04:00