apex-tripleo-heat-templates.git
7 years agoMerge "gnocchi: deploy services with Keystone v3 endpoints"
Jenkins [Mon, 13 Mar 2017 18:49:42 +0000 (18:49 +0000)]
Merge "gnocchi: deploy services with Keystone v3 endpoints"

7 years agoMerge "manila: switch auth_uri to use uri_no_suffix"
Jenkins [Mon, 13 Mar 2017 18:49:34 +0000 (18:49 +0000)]
Merge "manila: switch auth_uri to use uri_no_suffix"

7 years agoMerge "heat: switch auth_uri to use uri_no_suffix"
Jenkins [Mon, 13 Mar 2017 18:44:34 +0000 (18:44 +0000)]
Merge "heat: switch auth_uri to use uri_no_suffix"

7 years agoMerge "ironic: switch auth_uri to uri_no_suffix"
Jenkins [Mon, 13 Mar 2017 18:44:27 +0000 (18:44 +0000)]
Merge "ironic: switch auth_uri to uri_no_suffix"

7 years agoMerge "telemetry: switch auth_uri to uri_no_suffix"
Jenkins [Mon, 13 Mar 2017 18:44:12 +0000 (18:44 +0000)]
Merge "telemetry: switch auth_uri to uri_no_suffix"

7 years agoMerge "nova: switch auth_uri to keystone versionless endpoint"
Jenkins [Mon, 13 Mar 2017 18:44:05 +0000 (18:44 +0000)]
Merge "nova: switch auth_uri to keystone versionless endpoint"

7 years agoMerge "horizon: switch keystone_url to use uri_no_suffix"
Jenkins [Mon, 13 Mar 2017 18:41:08 +0000 (18:41 +0000)]
Merge "horizon: switch keystone_url to use uri_no_suffix"

7 years agoMerge "Improve SSL support for Sensu"
Jenkins [Mon, 13 Mar 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Improve SSL support for Sensu"

7 years agoMerge "Fix bogus parameters in get_param"
Jenkins [Mon, 13 Mar 2017 15:23:14 +0000 (15:23 +0000)]
Merge "Fix bogus parameters in get_param"

7 years agoMerge "Containerize Aodh alarm services"
Jenkins [Mon, 13 Mar 2017 15:22:46 +0000 (15:22 +0000)]
Merge "Containerize Aodh alarm services"

7 years agoMerge "Upgrades: wait for galera to be settled"
Jenkins [Mon, 13 Mar 2017 12:20:20 +0000 (12:20 +0000)]
Merge "Upgrades: wait for galera to be settled"

7 years agognocchi: deploy services with Keystone v3 endpoints
Emilien Macchi [Tue, 7 Mar 2017 21:18:50 +0000 (16:18 -0500)]
gnocchi: deploy services with Keystone v3 endpoints

* Move swift_authurl to gnocchi-base hieradata, where other swift auth
  credentials live and switch it to versionless keystone endpoint.
* Force swift_auth_version to 3 for Keystone v3.
* Switch auth_uri to use versionless Keystone endpoint.
* Switch auth_url to use Keystone admin endpoint (instead of internal).
* Remove old parameters from gnocchi::api, not used anymore.

Partial-blueprint: keystone-v3

Change-Id: I2feed8b1219069128faa1a1e8dcd2ddfbae7e40a

7 years agotelemetry: switch auth_uri to uri_no_suffix
Emilien Macchi [Fri, 10 Mar 2017 17:09:04 +0000 (12:09 -0500)]
telemetry: switch auth_uri to uri_no_suffix

Switch Aodh, Ceilometer and Panko to use auth_uri parameter with
keystone versionless endpoint.

Change-Id: I5800f4161d0406d3717e1f539d23411b11378fbc
Partial-implement: blueprint keystone-v3

7 years agoheat: switch auth_uri to use uri_no_suffix
Emilien Macchi [Fri, 10 Mar 2017 17:21:12 +0000 (12:21 -0500)]
heat: switch auth_uri to use uri_no_suffix

Switch Heat to use auth_uri with keystone versionless endpoint.

Change-Id: Iddd091a659d37d965b216db9f536d30245cd3c3a
Partial-implement: blueprint keystone-v3

7 years agoironic: switch auth_uri to uri_no_suffix
Emilien Macchi [Fri, 10 Mar 2017 17:28:41 +0000 (12:28 -0500)]
ironic: switch auth_uri to uri_no_suffix

Switch Ironic to use auth_uri with keystone versionless endpoint.

Change-Id: Ia8061a1e08bd31425f8d4192cd45b64b9f8e1f74
Partial-implement: blueprint keystone-v3

7 years agomanila: switch auth_uri to use uri_no_suffix
Emilien Macchi [Fri, 10 Mar 2017 17:30:14 +0000 (12:30 -0500)]
manila: switch auth_uri to use uri_no_suffix

Switch Manila to use auth_uri with keystone versionless endpoint.

Change-Id: If05032a5c7d93b5787d3f18c0aa374bac3cbd478
Partial-implement: blueprint keystone-v3

7 years agonova: switch auth_uri to keystone versionless endpoint
Emilien Macchi [Fri, 10 Mar 2017 15:41:38 +0000 (10:41 -0500)]
nova: switch auth_uri to keystone versionless endpoint

Switch nova authtoken auth_uri to use keystone endpoint without version.
Also switch ironic config in nova.conf to use it.

Change-Id: I8046f2eed0b9a7da76d6d7c3507a92bf5054b000
Partial-Implement: blueprint keystone-v3

7 years agoMerge "Remove ha-by-default release note"
Jenkins [Mon, 13 Mar 2017 08:48:26 +0000 (08:48 +0000)]
Merge "Remove ha-by-default release note"

7 years agoUpgrades: wait for galera to be settled
Michele Baldessari [Tue, 28 Feb 2017 12:25:59 +0000 (13:25 +0100)]
Upgrades: wait for galera to be settled

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/

Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd
Closes-Bug: #1668372

7 years agoMerge "Move zaqar into services-docker"
Jenkins [Mon, 13 Mar 2017 00:02:21 +0000 (00:02 +0000)]
Merge "Move zaqar into services-docker"

7 years agoMerge "Add BGPVPN composable service"
Jenkins [Sat, 11 Mar 2017 19:36:49 +0000 (19:36 +0000)]
Merge "Add BGPVPN composable service"

7 years agoRemove double quotes in the "when" Ansible conditional.
Carlos Camacho [Mon, 6 Mar 2017 14:44:13 +0000 (15:44 +0100)]
Remove double quotes in the "when" Ansible conditional.

Change-Id: I677075012a948c7c32959680608255eff919b8d4

7 years agoAdd upgrade tasks for heat over httpd
Juan Antonio Osorio Robles [Mon, 6 Mar 2017 07:56:43 +0000 (09:56 +0200)]
Add upgrade tasks for heat over httpd

Change-Id: Ia7b8c41d4d8135f58661a74a4298f60abb251fbe

7 years agoMerge "Pass hieradata relevant for httpd in the Heat APIs"
Jenkins [Fri, 10 Mar 2017 20:48:25 +0000 (20:48 +0000)]
Merge "Pass hieradata relevant for httpd in the Heat APIs"

7 years agoMerge "Add pep8 tests on docker/services/*"
Jenkins [Fri, 10 Mar 2017 19:38:31 +0000 (19:38 +0000)]
Merge "Add pep8 tests on docker/services/*"

7 years agohorizon: switch keystone_url to use uri_no_suffix
Emilien Macchi [Fri, 10 Mar 2017 17:25:40 +0000 (12:25 -0500)]
horizon: switch keystone_url to use uri_no_suffix

Switch Horizon to use keystone_url with keystone versionless endpoint.

Change-Id: I7a22136937d414b2c3713894e04b0f093247ad33
Partial-implement: blueprint keystone-v3

7 years agoMerge "Move mistral into services-docker"
Jenkins [Fri, 10 Mar 2017 17:01:13 +0000 (17:01 +0000)]
Merge "Move mistral into services-docker"

7 years agoMerge "Remove glance-base service"
Jenkins [Fri, 10 Mar 2017 17:00:04 +0000 (17:00 +0000)]
Merge "Remove glance-base service"

7 years agoMerge "Move ironic into services-docker"
Jenkins [Fri, 10 Mar 2017 16:58:56 +0000 (16:58 +0000)]
Merge "Move ironic into services-docker"

7 years agoRemove ha-by-default release note
Ben Nemec [Fri, 10 Mar 2017 16:26:12 +0000 (10:26 -0600)]
Remove ha-by-default release note

This has not landed yet but was accidentally release noted for
Ocata.  The release note should land with the patch that actually
makes the change: I0f61016df6a9f07971c5eab51cc9674a1458c66f

Change-Id: I7d68899a5892e219b73007b18ab42e06196ae07a

7 years agoContainerize Aodh alarm services
Pradeep Kilambi [Wed, 1 Mar 2017 15:40:17 +0000 (10:40 -0500)]
Containerize Aodh alarm services

Closes-bug: #1668930

Change-Id: If5dff4388b255373083e164a74aaacd529a94111

7 years agoAdd BGPVPN composable service
Ricardo Noriega [Thu, 2 Feb 2017 10:45:38 +0000 (11:45 +0100)]
Add BGPVPN composable service

 This project aims at supporting inter-connection between L3VPNs
 and Neutron resources, i.e. Networks, Routers and Ports.

Partially-Implements: blueprint bgpvpn-service-integration

Depends-On:I7c1686693a29cc1985f009bd7a3c268c0e211876
Change-Id: I576c9ac2b443dbb6886824b3da457dcc4f87b442
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
7 years agoAdd pep8 tests on docker/services/*
Dan Prince [Mon, 6 Mar 2017 21:31:14 +0000 (16:31 -0500)]
Add pep8 tests on docker/services/*

This patch adds the beginning of a set of unit tests
for the new docker services templates. This should help
us the new interfaces as they evolve.

Change-Id: I98a73cf090ebab4593a682f5f34c0950d37e010c

7 years agoRemove docker_image sections (unused)
Dan Prince [Mon, 6 Mar 2017 18:58:10 +0000 (13:58 -0500)]
Remove docker_image sections (unused)

We don't use docker_image for anything. It is a remant of the
pre-composable docker templates and we can now remove it.

This patch removes references to the 'docker_image' section
from docker/post.yaml and all of the docker/services* templates.

Change-Id: I208c1ef1550ab39ab0ee47ab282f9b1937379810

7 years agoMerge "Pass hieradata for internal TLS for RabbitMQ"
Jenkins [Thu, 9 Mar 2017 22:56:55 +0000 (22:56 +0000)]
Merge "Pass hieradata for internal TLS for RabbitMQ"

7 years agoMerge "FQDN validation"
Jenkins [Thu, 9 Mar 2017 21:44:21 +0000 (21:44 +0000)]
Merge "FQDN validation"

7 years agoMerge "Keystone token flush cron job should log to a file"
Jenkins [Thu, 9 Mar 2017 21:44:13 +0000 (21:44 +0000)]
Merge "Keystone token flush cron job should log to a file"

7 years agoPass hieradata relevant for httpd in the Heat APIs
Juan Antonio Osorio Robles [Fri, 3 Mar 2017 08:19:34 +0000 (10:19 +0200)]
Pass hieradata relevant for httpd in the Heat APIs

The patch this depends on passes through the classes some parameters
that are meant to be passed via t-h-t. This patch addresses these and
other things required for deploying these services over httpd:

* Set the number of workers taking care not to set this value to 0.
* Add the apache base hieradata to the service profiles.
* Set the servernames and other httpd-specific values.

bp tls-via-certmonger

Change-Id: I88e5ea7b9bbf35ae03f84fdc3ec76ae09f11a1b6
Depends-On: I23971b0164468e67c9b3577772af84bd947e16f1

7 years agoUpdate docs per new puppet_config interface
Dan Prince [Tue, 7 Mar 2017 19:12:37 +0000 (14:12 -0500)]
Update docs per new puppet_config interface

This updates the docker/service README so that it
correctly documents the current requirements of the new
puppet_config interface.

Change-Id: I0f3e00ea3cce24152475abf6df34f4836e32c9c8

7 years agoImprove SSL support for Sensu
Martin Mágr [Thu, 12 Jan 2017 13:21:42 +0000 (14:21 +0100)]
Improve SSL support for Sensu

This patch allows operator to create SSL certificates for SSL auth to RabbitMQ.

Change-Id: I250aedcfdbe3b7a7e8c611c0e6122cf8fe0edda4

7 years agoMerge "Move nova-scheduler data into puppet_config"
Jenkins [Thu, 9 Mar 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Move nova-scheduler data into puppet_config"

7 years agoMerge "Add validation for VPP upgrade tasks"
Jenkins [Thu, 9 Mar 2017 13:13:40 +0000 (13:13 +0000)]
Merge "Add validation for VPP upgrade tasks"

7 years agoMerge "Enable Docker service for Compute role"
Jenkins [Thu, 9 Mar 2017 11:51:28 +0000 (11:51 +0000)]
Merge "Enable Docker service for Compute role"

7 years agoMerge "Set number of Swift proxy server workers to auto"
Jenkins [Thu, 9 Mar 2017 11:28:55 +0000 (11:28 +0000)]
Merge "Set number of Swift proxy server workers to auto"

7 years agoPass hieradata for internal TLS for RabbitMQ
Juan Antonio Osorio Robles [Fri, 9 Dec 2016 13:22:42 +0000 (15:22 +0200)]
Pass hieradata for internal TLS for RabbitMQ

As with other services, this passes the necessary hieradata to enable
TLS for RabbitMQ. This will mean (once we set it via puppet-tripleo)
that there will only be TLS connections, as the ssl_only option is being
used.

bp tls-via-certmonger

Change-Id: I960bf747cd5e3040f99b28e2fc5873ca3a7472b5
Depends-On: Ic2a7f877745a0a490ddc9315123bd1180b03c514

7 years agoMerge "sahara: configure keystone_authtoken parameters"
Jenkins [Thu, 9 Mar 2017 10:20:48 +0000 (10:20 +0000)]
Merge "sahara: configure keystone_authtoken parameters"

7 years agoMerge "barbican: Use versionless keystone endpoints"
Jenkins [Thu, 9 Mar 2017 09:57:24 +0000 (09:57 +0000)]
Merge "barbican: Use versionless keystone endpoints"

7 years agoMove zaqar into services-docker
Dan Prince [Wed, 8 Mar 2017 20:29:45 +0000 (15:29 -0500)]
Move zaqar into services-docker

This patch moves enabling Zaqar docker services into
a separate environment in the environments/services-docker
directory.

Change-Id: I6755eb7ae2abb2b9c8b213ff6fd21b0392353ef5

7 years agoMove mistral into services-docker
Dan Prince [Wed, 8 Mar 2017 20:28:25 +0000 (15:28 -0500)]
Move mistral into services-docker

This patch moves enabling Mistral docker services into
a separate environment in the environments/services-docker
directory.

Change-Id: I8b484532de5f5d61fc0240defbc5fc27789a1279

7 years agoMove ironic into services-docker
Dan Prince [Wed, 8 Mar 2017 20:26:15 +0000 (15:26 -0500)]
Move ironic into services-docker

This patch moves enabling Ironic docker services into
a separate environment in the environments/services-docker
directory.

Change-Id: I236de47d422b3563a0192359f2327610fc1714ca

7 years agosahara: configure keystone_authtoken parameters
Emilien Macchi [Tue, 7 Mar 2017 17:06:10 +0000 (12:06 -0500)]
sahara: configure keystone_authtoken parameters

Configure keystone_authtoken for Sahara service.

Change-Id: I045b7d1d52851ab0d532a8524fcea95705e3db78
Partial-implement: blueprint keystone-v3

7 years agoMerge "Remove the openvswitch special case upgrade code"
Jenkins [Wed, 8 Mar 2017 09:51:16 +0000 (09:51 +0000)]
Merge "Remove the openvswitch special case upgrade code"

7 years agobarbican: Use versionless keystone endpoints
Juan Antonio Osorio Robles [Wed, 8 Mar 2017 08:17:11 +0000 (10:17 +0200)]
barbican: Use versionless keystone endpoints

This also moves the explicit usages of the Keystone V3 endpoint fromt he
EndpointMap, as using the uri_no_suffix defeats that usage.

Change-Id: I5f07a0cee07fa28b88c419e25e014094004b1bce
Partial-Implement: blueprint keystone-v3

7 years agoMove nova-scheduler data into puppet_config
Dan Prince [Tue, 7 Mar 2017 18:17:29 +0000 (13:17 -0500)]
Move nova-scheduler data into puppet_config

This is now required per the puppet_config interfaces for docker
services (per I208c1ef1550ab39ab0ee47ab282f9b1937379810)

Change-Id: Iab96919cb0a6b15942f3c19f8d28205261174edc

7 years agoEnable Docker service for Compute role
Martin André [Tue, 7 Mar 2017 15:06:30 +0000 (16:06 +0100)]
Enable Docker service for Compute role

A recent commit [1] change how docker is installed and configured on
the overcloud nodes, from a cloud-init script to a proper puppet
profile in puppet-tripleo but forgot to enable the docker service on
the compute nodes.

[1] Ia50169819cb959025866348b11337728f8ed5c9e

Change-Id: I202723d0e48f110e5b0dbfe3dcf6646da9f37948

7 years agoMerge "sshd template, rename hiera key"
Jenkins [Tue, 7 Mar 2017 23:56:18 +0000 (23:56 +0000)]
Merge "sshd template, rename hiera key"

7 years agoRemove glance-base service
Emilien Macchi [Tue, 7 Mar 2017 22:03:18 +0000 (17:03 -0500)]
Remove glance-base service

glance-base is not useful anymore since we only run Glance API service
and there is no plan yet to add new services for Glance. Let's cleanup
this useless service and consolidate glance-api service.

Change-Id: I73cd0def2ae73e0bd52104c6710998df4a0d2e58

7 years agoAdd puppet_config to docker neutron-l3 service
Dan Prince [Mon, 6 Mar 2017 21:34:13 +0000 (16:34 -0500)]
Add puppet_config to docker neutron-l3 service

This patch makes the neutron-l3 docker service adhere
to the new puppet_config interface.

Change-Id: If5b73ec90637e878af55c8404d1eff8c18e857c3

7 years agoMerge "Enable keystone cadf notifications"
Jenkins [Tue, 7 Mar 2017 16:40:53 +0000 (16:40 +0000)]
Merge "Enable keystone cadf notifications"

7 years agosshd template, rename hiera key
Steven Hardy [Tue, 7 Mar 2017 11:43:00 +0000 (11:43 +0000)]
sshd template, rename hiera key

This means we can remove the special BannerText hiera reference
in the puppet-tripleo profile

Change-Id: Id4c8b853fa0e9bcdffe2cf7cd1554a9be7451b25

7 years agoMerge "Enable composable upgrades for docker service templates"
Jenkins [Tue, 7 Mar 2017 10:08:20 +0000 (10:08 +0000)]
Merge "Enable composable upgrades for docker service templates"

7 years agoMerge "Add docker composable service template"
Jenkins [Tue, 7 Mar 2017 10:06:09 +0000 (10:06 +0000)]
Merge "Add docker composable service template"

7 years agoMerge "Adds upgrade tasks for OpenDaylight services"
Jenkins [Tue, 7 Mar 2017 03:39:38 +0000 (03:39 +0000)]
Merge "Adds upgrade tasks for OpenDaylight services"

7 years agoMerge "Overwrite nova placement with stub for docker"
Jenkins [Tue, 7 Mar 2017 00:29:31 +0000 (00:29 +0000)]
Merge "Overwrite nova placement with stub for docker"

7 years agoMerge "Fix a typo"
Jenkins [Mon, 6 Mar 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Fix a typo"

7 years agoMerge "Cinder-api upgrade: use httpd instead of apachectl"
Jenkins [Mon, 6 Mar 2017 18:46:22 +0000 (18:46 +0000)]
Merge "Cinder-api upgrade: use httpd instead of apachectl"

7 years agoFix bogus parameters in get_param
Bogdan Dobrelya [Mon, 6 Mar 2017 16:49:01 +0000 (17:49 +0100)]
Fix bogus parameters in get_param

Change-Id: I1b5658efaaa26c473ceef184a962ec320f267ffe
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
7 years agoEnable keystone cadf notifications
Yolanda Robla [Mon, 6 Mar 2017 17:09:19 +0000 (18:09 +0100)]
Enable keystone cadf notifications

It will allow to configure keystone event notifications
using CADF, as documented on:
https://docs.openstack.org/developer/keystone/event_notifications.html

CADF events provide auditing capabilities for compliance with
security.

Change-Id: Id16b264c295b9e3adbf960366ff8328ba8dcd485

7 years agoEnable composable upgrades for docker service templates
Steven Hardy [Wed, 1 Mar 2017 13:57:13 +0000 (13:57 +0000)]
Enable composable upgrades for docker service templates

This aligns the docker based services with the new composable upgrades
architecture we landed for ocata, and does a first-pass adding upgrade_tasks
for the services (these may change, atm we only disable the service on
the host).

To run the upgrade workflow you basically do two steps:

openstack overcloud deploy --templates \
  -e environments/major-upgrade-composable-steps-docker.yaml

This will run the ansible upgrade steps we define via upgrade_tasks
then run the normal docker PostDeploySteps to bring up the containers.

For the puppet workflow there's then an operator driven step where
compute nodes (and potentially storage nodes) are upgrades in batches
and finally you do:

openstack overcloud deploy --templates \
  -e environments/major-upgrade-converge-docker.yaml

In the puppet case this re-applies puppet to unpin the nova RPC API
so I guess it'll restart the nova containers this affects but otherwise
will be a no-op (we also disable the ansible steps at this point.

Depends-On: I9057d47eea15c8ba92ca34717b6b5965d4425ab1
Change-Id: Ia50169819cb959025866348b11337728f8ed5c9e

7 years agoAdd docker composable service template
Steven Hardy [Thu, 2 Mar 2017 12:08:39 +0000 (12:08 +0000)]
Add docker composable service template

This uses a puppet-tripleo profile to configure and start docker
in step1 of the deployment, which is before we attempt to deploy
any containers (see docker/services/README.rst#docker-steps)

This enables existing environments on upgrade to configure things
correctly, without using the docker/firstboot/setup_docker_host.sh
- the firstboot approach may still be needed for atomic, but for
environments where we can run puppet on the host this integrates
more cleanly with our existing architecture I think.

Depends-On: Id8add1e8a0ecaedb7d8a7dc9ba3747c1ac3b8eea
Change-Id: If4ffe21579bcb2770f4e5a96be7960b52927a27b

7 years agoMerge "Make neutron dhcp agents per network conditional"
Jenkins [Mon, 6 Mar 2017 14:42:57 +0000 (14:42 +0000)]
Merge "Make neutron dhcp agents per network conditional"

7 years agoMerge "Use the new hiera hook in all remaining templates"
Jenkins [Mon, 6 Mar 2017 14:04:46 +0000 (14:04 +0000)]
Merge "Use the new hiera hook in all remaining templates"

7 years agoAdd validation for VPP upgrade tasks
Feng Pan [Tue, 28 Feb 2017 12:58:39 +0000 (07:58 -0500)]
Add validation for VPP upgrade tasks

Change-Id: I54a3cac11ae63c553f831a3f8eeca2cbe4cc88d3
Signed-off-by: Feng Pan <fpan@redhat.com>
7 years agoCinder-api upgrade: use httpd instead of apachectl
Juan Antonio Osorio Robles [Mon, 6 Mar 2017 12:21:10 +0000 (14:21 +0200)]
Cinder-api upgrade: use httpd instead of apachectl

It doesn't work downstream, so the httpd command was recommended.

Change-Id: I4807333b80dad10f16e5deb56cbfdda656cd1e50

7 years agoMerge "ec2-api: Get FQDN from hiera instead of puppet fact"
Jenkins [Mon, 6 Mar 2017 12:18:57 +0000 (12:18 +0000)]
Merge "ec2-api: Get FQDN from hiera instead of puppet fact"

7 years agoMerge "Removes old environment file references"
Jenkins [Mon, 6 Mar 2017 11:53:03 +0000 (11:53 +0000)]
Merge "Removes old environment file references"

7 years agoMerge "Put docker puppet config in puppet_config dict"
Jenkins [Mon, 6 Mar 2017 10:32:52 +0000 (10:32 +0000)]
Merge "Put docker puppet config in puppet_config dict"

7 years agoUse the new hiera hook in all remaining templates
marios [Mon, 6 Mar 2017 08:33:01 +0000 (10:33 +0200)]
Use the new hiera hook in all remaining templates

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

7 years agoMerge "etcd: Get FQDN from hiera instead of puppet fact"
Jenkins [Sat, 4 Mar 2017 11:32:20 +0000 (11:32 +0000)]
Merge "etcd: Get FQDN from hiera instead of puppet fact"

7 years agoMerge "Fix httpd dir create to not error if exists"
Jenkins [Fri, 3 Mar 2017 22:09:43 +0000 (22:09 +0000)]
Merge "Fix httpd dir create to not error if exists"

7 years agoMerge "Fix Panko API upgrade process"
Jenkins [Fri, 3 Mar 2017 15:04:51 +0000 (15:04 +0000)]
Merge "Fix Panko API upgrade process"

7 years agoRemoves old environment file references
Christopher Brown [Fri, 3 Mar 2017 14:00:53 +0000 (14:00 +0000)]
Removes old environment file references

ODL-l3 env file was removed in commit 7163746
manage-firewall was removed in commit 2064ab8 as this was enabled
by default

Change-Id: I8ed8d4ed5bf709f2ac581adfaacc24a7582f13bd

7 years agoFix httpd dir create to not error if exists
Pradeep Kilambi [Thu, 2 Mar 2017 16:53:26 +0000 (11:53 -0500)]
Fix httpd dir create to not error if exists

In cases where /var/log/httpd already exists, this exits with error
code 1.

$ sudo docker logs keystone-init-log
mkdir: cannot create directory '/var/log/httpd': File exists

Change-Id: I62bf08d9fc9e02d5f3016bd14bb0a090b76ac837

7 years agoMerge "Enable IronicPxe in the undercloud"
Jenkins [Fri, 3 Mar 2017 12:53:46 +0000 (12:53 +0000)]
Merge "Enable IronicPxe in the undercloud"

7 years agoMerge "Removes opencontrail reference"
Jenkins [Fri, 3 Mar 2017 11:48:34 +0000 (11:48 +0000)]
Merge "Removes opencontrail reference"

7 years agoetcd: Get FQDN from hiera instead of puppet fact
Juan Antonio Osorio Robles [Fri, 3 Mar 2017 09:08:38 +0000 (11:08 +0200)]
etcd: Get FQDN from hiera instead of puppet fact

The puppet facts will be removed soon and using the hiera value is
adviced instead.

Change-Id: I318f81abaac997370e950780993dc95cae088327

7 years agoec2-api: Get FQDN from hiera instead of puppet fact
Juan Antonio Osorio Robles [Fri, 3 Mar 2017 09:07:08 +0000 (11:07 +0200)]
ec2-api: Get FQDN from hiera instead of puppet fact

The puppet facts will be removed soon and using the hiera value is
adviced instead.

Change-Id: I3ba89dd9bd471c5723325efc9041ca6da937ccc5

7 years agoRemove the openvswitch special case upgrade code
marios [Wed, 22 Feb 2017 15:29:45 +0000 (17:29 +0200)]
Remove the openvswitch special case upgrade code

Removed from the tripleo_upgrade_node.sh (major upgrade) & yum_update.sh
(minor update). The workaround is no longer needed and in fact has the
opposite effect killing connectitivity to the node. The 'normal' yum
update on nodes delivers the latest openvswitch 2.6.1 with no drama.

Also adds a 'complete' message, some extra debug echo for logs
and removes the python-zaqarclient install no longer needed

Closes-Bug: 1669714
Change-Id: Icd1517bcade36781fa0da21d045ffd9ec68efc38

7 years agoFix Panko API upgrade process
Emilien Macchi [Fri, 3 Mar 2017 03:24:52 +0000 (22:24 -0500)]
Fix Panko API upgrade process

Upgrade process wasn't consistent and correct.

Change-Id: Id1f810d33c2909957be9a2c96d18c96dee939953

7 years agoMerge "Make UpdateDeployment depend on NetworkDeployment"
Jenkins [Thu, 2 Mar 2017 23:31:43 +0000 (23:31 +0000)]
Merge "Make UpdateDeployment depend on NetworkDeployment"

7 years agoOverwrite nova placement with stub for docker
Dan Prince [Thu, 2 Mar 2017 17:41:30 +0000 (12:41 -0500)]
Overwrite nova placement with stub for docker

This updates kolla config to overwrite the stock
version with the puppet-nova generated mock.

Depends-On: Ie16a60c604ecf9f4012b0630f91e6ece2b6855db

Change-Id: I320f024adc88102ea24c0212702fe2dce826874f
Closes-bug: #440612

7 years agoEnable IronicPxe in the undercloud
Dan Prince [Thu, 2 Mar 2017 20:11:10 +0000 (15:11 -0500)]
Enable IronicPxe in the undercloud

This enables the IronicPxe services which are split out
into separate templates for the containerized undercloud.

Change-Id: I0ec3cefec9b47ef3c59de6972541ef9b560aacb7

7 years agoMerge "Add plan-environment.yaml"
Jenkins [Thu, 2 Mar 2017 18:47:35 +0000 (18:47 +0000)]
Merge "Add plan-environment.yaml"

7 years agoRemoves opencontrail reference
Christopher Brown [Thu, 2 Mar 2017 16:21:55 +0000 (16:21 +0000)]
Removes opencontrail reference

The opencontrail environment file was removed in commit da91bb6
so this is no longer required

Change-Id: I835dc665ede7fdb50d5be2c3251b8acf20c3ce37

7 years agoMerge "Add upgrade task for panko api"
Jenkins [Thu, 2 Mar 2017 14:01:32 +0000 (14:01 +0000)]
Merge "Add upgrade task for panko api"

7 years agoMerge "Upgrades: fix up the rabbitmq HA mode like in new ocata deployments"
Jenkins [Thu, 2 Mar 2017 12:21:15 +0000 (12:21 +0000)]
Merge "Upgrades: fix up the rabbitmq HA mode like in new ocata deployments"

7 years agoAdd upgrade task for panko api
Pradeep Kilambi [Sun, 26 Feb 2017 23:34:33 +0000 (18:34 -0500)]
Add upgrade task for panko api

Change-Id: Icc5fbf99301ae47344e1582767e1e7a4687f491b

7 years agoMerge "Add mistral service support for composable upgrades"
Jenkins [Thu, 2 Mar 2017 09:49:44 +0000 (09:49 +0000)]
Merge "Add mistral service support for composable upgrades"

7 years agoMerge "upgrades/validation: only run validation when services exist"
Jenkins [Thu, 2 Mar 2017 09:49:37 +0000 (09:49 +0000)]
Merge "upgrades/validation: only run validation when services exist"

7 years agoUpgrades: fix up the rabbitmq HA mode like in new ocata deployments
Michele Baldessari [Tue, 28 Feb 2017 15:37:07 +0000 (16:37 +0100)]
Upgrades: fix up the rabbitmq HA mode like in new ocata deployments

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