apex-tripleo-heat-templates.git
7 years ago[N->O] is creating 2 default cell_v2 cells
Oliver Walsh [Thu, 23 Mar 2017 13:50:55 +0000 (13:50 +0000)]
[N->O] is creating 2 default cell_v2 cells

A side-effect of running map_cell_and_hosts is that a default cell is created
(unless host mappings already exists).
As we are explicitly creating the default cell we need to run discover_hosts
to create the host mappings.

Change-Id: I1a28e9b85a7c43561700faf692248c5fc06b8ad8
Closes-Bug: #1675418
(cherry picked from commit ab4adb9fb1b1ba003a8045ce4c3879f88ea243b3)

7 years agoMerge "Add bindep support" into stable/ocata
Jenkins [Thu, 23 Mar 2017 06:17:23 +0000 (06:17 +0000)]
Merge "Add bindep support" into stable/ocata

7 years agoMerge "Cleanup no longer used upgrade files" into stable/ocata
Jenkins [Wed, 22 Mar 2017 15:56:35 +0000 (15:56 +0000)]
Merge "Cleanup no longer used upgrade files" into stable/ocata

7 years agoAdd bindep support
Paul Belanger [Mon, 13 Mar 2017 16:10:53 +0000 (12:10 -0400)]
Add bindep support

Bindep is an automation tool used by openstack-infra to bootstrap a
worker with default packages. This is not needed, since we depend on
puppet to automate this step.

Change-Id: I759614ed0cf1fab5433956ed459419e564590398
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
(cherry picked from commit 209d8f5eac9273372aa44988436ae7f12596cd0d)

7 years agoMerge "Disable exit on error for pacemaker commands for update flow" into stable...
Jenkins [Tue, 21 Mar 2017 10:39:58 +0000 (10:39 +0000)]
Merge "Disable exit on error for pacemaker commands for update flow" into stable/ocata

7 years agoMake sure PrePuppet runs before any Deployment_Step
Michele Baldessari [Fri, 17 Mar 2017 14:36:50 +0000 (15:36 +0100)]
Make sure PrePuppet runs before any Deployment_Step

We used to have this in mitaka:
https://github.com/openstack/tripleo-heat-templates/blob/stable/mitaka/puppet/controller-post.yaml#L45

but we lost it along the way. The problem without this change is that we
are open to the following race:
1) ControllerDeployment_Step1 is started and manages to do a successful
   "systemctl start pacemaker"
2) PrePuppet gets called and in the HA deployment calls
   pacemaker_maintenance_mode.sh
3) pacemaker_maintenance_mode.sh will set the maintenance-mode=true
   property because the pacemaker service is already up:
   https://github.com/openstack/tripleo-heat-templates/blob/master/extraconfig/tasks/pacemaker_maintenance_mode.sh#L8-L9
4) If the maintenance property is set to true at this stage, the
   creation of any resource will take place but they won't really
   start.

Note that this is not a straight cherry pick from commit
bae48e60b3cb9b5f21490997ca39c1e0e23fd195 because in ocata only
ControllerPrePuppet exists and not {{role.name}}PrePuppet like in
pike.

Change-Id: Icb7495edd00385b2975dd42f63085d20292ef9a9
Closes-Bug: #1673795
Co-Authored-By: Jiri Stransky <jstransk@redhat.com>
7 years agoCleanup no longer used upgrade files
marios [Wed, 15 Mar 2017 08:28:17 +0000 (10:28 +0200)]
Cleanup no longer used upgrade files

Removes some of the no longer used scripts and templates used by
the upgrades workflow in previous versions.

Closes-Bug: 1673447
Change-Id: I7831d20eae6ab9668a919b451301fe669e2b1346
(cherry picked from commit 521a8973229484d52c03e9ed04782c5dc493c1b0)

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/

D-O is needed for upgrades to work against stable/* branches.
Depends-On: I712abe71f97c22ee3d55d9db2f641096f8a7350c

Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd
Closes-Bug: #1668372
(cherry picked from commit 841d30549bd27a8b5669955196e14085025dafad)

7 years agoMerge "Remove ha-by-default release note in Ocata" into stable/ocata
Jenkins [Fri, 10 Mar 2017 18:08:46 +0000 (18:08 +0000)]
Merge "Remove ha-by-default release note in Ocata" into stable/ocata

7 years agoMerge "Adds upgrade tasks for OpenDaylight services" into stable/ocata
Jenkins [Fri, 10 Mar 2017 02:40:11 +0000 (02:40 +0000)]
Merge "Adds upgrade tasks for OpenDaylight services" into stable/ocata

7 years agoMerge "Remove the openvswitch special case upgrade code" into stable/ocata
Jenkins [Thu, 9 Mar 2017 14:24:12 +0000 (14:24 +0000)]
Merge "Remove the openvswitch special case upgrade code" into stable/ocata

7 years agoAdds upgrade tasks for OpenDaylight services
Tim Rozet [Mon, 27 Feb 2017 20:19:56 +0000 (15:19 -0500)]
Adds upgrade tasks for OpenDaylight services

Change-Id: I740b20b12acb3740886409bff86c4989f0a066f4
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 20d7901ab24e93e0224cc1c8b0cde3eb80122818)

7 years agoRemove ha-by-default release note in Ocata
Carlos Camacho [Wed, 8 Mar 2017 09:48:55 +0000 (10:48 +0100)]
Remove ha-by-default release note in Ocata

This was not implemented for Ocata so this
release note should not exist.

Change-Id: I58216fb54a156853f60697a903f1c38cf7970216

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
(cherry picked from commit c5d10cd9fc94e6557417673190b73867a83cbb7b)

7 years agoreno: prepare 6.0.0 (Ocata GA)
Emilien Macchi [Mon, 6 Mar 2017 13:03:28 +0000 (08:03 -0500)]
reno: prepare 6.0.0 (Ocata GA)

Change-Id: Ia3e17aa0da1f199d28e589bf83e0fead37654ea4

7 years agoMerge "Adding keystone parameters for Congress" into stable/ocata
Jenkins [Sat, 4 Mar 2017 01:18:55 +0000 (01:18 +0000)]
Merge "Adding keystone parameters for Congress" into stable/ocata

7 years agoMerge "Make UpdateDeployment depend on NetworkDeployment" into stable/ocata
Jenkins [Fri, 3 Mar 2017 22:09:52 +0000 (22:09 +0000)]
Merge "Make UpdateDeployment depend on NetworkDeployment" into stable/ocata

7 years agoMerge "Fix Panko API upgrade process" into stable/ocata
Jenkins [Fri, 3 Mar 2017 22:08:26 +0000 (22:08 +0000)]
Merge "Fix Panko API upgrade process" into stable/ocata

7 years agoMake UpdateDeployment depend on NetworkDeployment
Steven Hardy [Wed, 1 Mar 2017 09:51:20 +0000 (09:51 +0000)]
Make UpdateDeployment depend on NetworkDeployment

Prior to https://review.openstack.org/#/c/271450/ os-net-config was
applied via os-refresh-config directly, which meant that even though
UpdateDeployment and NetworkDeployment can be created concurrently,
we'd always do the os-net-config step first.

However now that we apply both steps via scripts (which are both handled
via the same heat-config hook) we should add an explicit dependency to
ensure the network is always fully configured before attempting to run
any update.  This should avoid the risk of e.g running an update on
initial deployment before the network connectivity to access yum repos
is in place.

Change-Id: Idff7a95afe7b49b6384b1d0c78e76522fb1f8eb7
Related-Bug: #1666227
(cherry picked from commit 626b820b57498ff5002c5530962e6e4fd5644b51)

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
(cherry picked from commit 9025a3bc23834e31efc5021acaef80b8d0f5de73)

7 years agoMerge "Add upgrade task for panko api" into stable/ocata
Jenkins [Fri, 3 Mar 2017 15:04:43 +0000 (15:04 +0000)]
Merge "Add upgrade task for panko api" into stable/ocata

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
(cherry picked from commit 480baa3ce1c344b3279d5fe3292238c996bc856f)

7 years agoInstall nova-placement package on upgrade
Steven Hardy [Fri, 17 Feb 2017 10:00:24 +0000 (10:00 +0000)]
Install nova-placement package on upgrade

This doesn't exist in newton images, so install it via the
ansible tasks during step3 (when all other packages are updated).

Change-Id: I08fb7855b910ccc5a8ab2d73f1de15b695784abd
Closes-Bug: #1664265
(cherry picked from commit e6ed8a75eb8bebd22eef469bedeea7beae28037d)

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
(cherry picked from commit 7273a3de0296f6f75d4d549f72645ca916d967de)

7 years agoMerge "upgrades/validation: only run validation when services exist" into stable...
Jenkins [Thu, 2 Mar 2017 20:24:18 +0000 (20:24 +0000)]
Merge "upgrades/validation: only run validation when services exist" into stable/ocata

7 years agoMerge "Add mistral service support for composable upgrades" into stable/ocata
Jenkins [Thu, 2 Mar 2017 20:05:26 +0000 (20:05 +0000)]
Merge "Add mistral service support for composable upgrades" into stable/ocata

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
(cherry picked from commit 41514d0cd603194fecb327f96995c60a9fe6e67a)

7 years agoMerge "Align HCI environment file with list of services from roles_data" into stable...
Jenkins [Thu, 2 Mar 2017 12:20:24 +0000 (12:20 +0000)]
Merge "Align HCI environment file with list of services from roles_data" into stable/ocata

7 years agoAdd mistral service support for composable upgrades
Steven Hardy [Thu, 1 Dec 2016 10:04:58 +0000 (10:04 +0000)]
Add mistral service support for composable upgrades

Change-Id: I189edaf69c0e97a3399e6af939595f98322d7c03
Partially-Implements: blueprint overcloud-upgrades-per-service
(cherry picked from commit dedef90750827fd7b413eac32223f929c8ac5555)

7 years agoupgrades/validation: only run validation when services exist
Emilien Macchi [Mon, 27 Feb 2017 18:04:08 +0000 (13:04 -0500)]
upgrades/validation: only run validation when services exist

During upgrades, validation test if a service is running before the
upgrade process starts.
In some cases, servies doesn't exist yet so we don't want to run the
validation.

This patch makes sure we check if the service is actually present on the
system before validating it's running correctly.

Also it makes sure that services are enabled before trying to stop them.
It allows use-cases where we want to add new services during an upgrade.
Also install new packages of services added in Ocata, so we can validate
upgrades on scenarios jobs.

Change-Id: Ib48fb6b1557be43956557cbde4cbe26b53a50bd8
(cherry picked from commit 7c84a9b390c469e716e5802eef078d2df3902c6a)

7 years agoMerge "neutron: don't set external_network_bridge option by default" into stable...
Jenkins [Thu, 2 Mar 2017 05:12:41 +0000 (05:12 +0000)]
Merge "neutron: don't set external_network_bridge option by default" into stable/ocata

7 years agoMerge "Updated from global requirements" into stable/ocata
Jenkins [Thu, 2 Mar 2017 05:10:43 +0000 (05:10 +0000)]
Merge "Updated from global requirements" into stable/ocata

7 years agoMerge "Put service stop at step1 and quiesce at step2." into stable/ocata
Jenkins [Thu, 2 Mar 2017 02:35:34 +0000 (02:35 +0000)]
Merge "Put service stop at step1 and quiesce at step2." into stable/ocata

7 years agoMerge "Add etcd composable upgrade steps" into stable/ocata
Jenkins [Wed, 1 Mar 2017 23:32:37 +0000 (23:32 +0000)]
Merge "Add etcd composable upgrade steps" into stable/ocata

7 years agoPut service stop at step1 and quiesce at step2.
Sofer Athlan-Guyot [Fri, 24 Feb 2017 21:31:29 +0000 (22:31 +0100)]
Put service stop at step1 and quiesce at step2.

In the previous release[1], the services were stopped before the
pacemaker services, so that they get a chance to send last message to
the database/rabbitmq queue:

Let's do the upgrade in the same order.

[1] https://github.com/openstack/tripleo-heat-templates/blob/stable/newton/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh#L13-L71

Change-Id: I1c4045e8b9167396c9dfa4da99973102f1af1218
(cherry picked from commit fb7821378242e595184a38e1e0cb7e9978c0f806)

7 years agoMerge "Adding upgrade_tasks to tacker" into stable/ocata
Jenkins [Wed, 1 Mar 2017 19:06:58 +0000 (19:06 +0000)]
Merge "Adding upgrade_tasks to tacker" into stable/ocata

7 years agoMerge "Adding upgrade steps to congress service" into stable/ocata
Jenkins [Wed, 1 Mar 2017 19:06:08 +0000 (19:06 +0000)]
Merge "Adding upgrade steps to congress service" into stable/ocata

7 years agoDisable exit on error for pacemaker commands for update flow
Saravanan KR [Mon, 27 Feb 2017 13:46:03 +0000 (19:16 +0530)]
Disable exit on error for pacemaker commands for update flow

Package update fails on compute node, when yum_update checks for
pacemaker status via systemctl command. Because exit on error (-e)
option has been enabled recently, this issue is happening. Fixing
by, executing the command only on nodes where pacemaker is enabled.
Closes-Bug: #1668266

Change-Id: I2aae4e2fdfec526c835f8967b54e1db3757bca17
(cherry picked from commit e9a2fdc0afd2a3f1242f397c5f164cf6b43c2669)

7 years agoMerge "Add upgrade support for Horizon" into stable/ocata
Jenkins [Wed, 1 Mar 2017 16:42:45 +0000 (16:42 +0000)]
Merge "Add upgrade support for Horizon" into stable/ocata

7 years agoMerge "Add zaqar service for composable upgrade" into stable/ocata
Jenkins [Wed, 1 Mar 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add zaqar service for composable upgrade" into stable/ocata

7 years agoAdding upgrade_tasks to tacker
Dan Radez [Fri, 10 Feb 2017 18:34:39 +0000 (13:34 -0500)]
Adding upgrade_tasks to tacker

Change-Id: I0d7e151a931d02068dea80d7cf57b99736e689e6
(cherry picked from commit 077c2eeb40bf1e9d5ad011c4c6036614d03886b6)

7 years agoAdding upgrade steps to congress service
Dan Radez [Mon, 13 Feb 2017 14:23:33 +0000 (09:23 -0500)]
Adding upgrade steps to congress service

Change-Id: I79169baf4c59e9325355992288de2e9ad8088e3b
(cherry picked from commit bbe274862de5bfb317b9d44684556cb200c17f08)

7 years agoAdd upgrade support for Horizon
Emilien Macchi [Thu, 23 Feb 2017 17:58:16 +0000 (12:58 -0500)]
Add upgrade support for Horizon

Change-Id: I91c3c93c1571288daa78b6d24b0aa9824a2bb5c4
(cherry picked from commit db02313b2869aac0d0ddd41129eb9bebed1a24ad)

7 years agoAdd etcd composable upgrade steps
Carlos Camacho [Sun, 26 Feb 2017 20:27:18 +0000 (21:27 +0100)]
Add etcd composable upgrade steps

Adding etcd upgrade tasks

Change-Id: Ie891a1a03585b3aec1ed30c176b5fb6b67d7e4b7
(cherry picked from commit 489761e848ad4be0eb67bc405968ef2870b81f05)

7 years agoMerge "upgrades: fix ec2api conditional" into stable/ocata
Jenkins [Wed, 1 Mar 2017 07:17:47 +0000 (07:17 +0000)]
Merge "upgrades: fix ec2api conditional" into stable/ocata

7 years agoMerge "Add support for upgrading ec2-api" into stable/ocata
Jenkins [Wed, 1 Mar 2017 06:49:17 +0000 (06:49 +0000)]
Merge "Add support for upgrading ec2-api" into stable/ocata

7 years agoMerge "Adds http proxy support for registering RHEL overcloud nodes" into stable...
Jenkins [Wed, 1 Mar 2017 06:48:13 +0000 (06:48 +0000)]
Merge "Adds http proxy support for registering RHEL overcloud nodes" into stable/ocata

7 years agoMerge "Add auditd upgrate steps" into stable/ocata
Jenkins [Wed, 1 Mar 2017 05:57:48 +0000 (05:57 +0000)]
Merge "Add auditd upgrate steps" into stable/ocata

7 years agoupgrades: fix ec2api conditional
Emilien Macchi [Tue, 28 Feb 2017 16:09:41 +0000 (11:09 -0500)]
upgrades: fix ec2api conditional

Rename ec2-api_enabled to ec2_api_enabled so we avoid this error:
The conditional check 'ec2-api_enabled.rc == 0' failed.
The error was: error while evaluating conditional
(ec2-api_enabled.rc == 0): 'api_enabled' is undefined"}

Change-Id: Id325fd7eba397155eac7fb6c7410f88486173ba1
(cherry picked from commit d54532679edce04a5bdc3159489b77baf90b14ca)

7 years agoAdding keystone parameters for Congress
Dan Radez [Mon, 27 Feb 2017 17:06:33 +0000 (12:06 -0500)]
Adding keystone parameters for Congress

Change-Id: Ic50aee9e635f62f06fa757fa3d88d9d8c5b28fcb
(cherry picked from commit 242fd3072dd31effa4305567163469ec83e7a532)

7 years agoAdding keystone parameters for Tacker
Dan Radez [Mon, 27 Feb 2017 17:56:58 +0000 (12:56 -0500)]
Adding keystone parameters for Tacker

Change-Id: I256d2fcb6353d029750113c1fec59a89c82583ca
(cherry picked from commit a9c64bd39d28cc073a7f2d19a17466d29be6cc0f)

7 years agoAdd auditd upgrate steps
Carlos Camacho [Sun, 26 Feb 2017 20:36:39 +0000 (21:36 +0100)]
Add auditd upgrate steps

Add base upgrade steps for auditd

Change-Id: Iaa56eb40ed80d20744cf8bab18504d700466d26e
(cherry picked from commit 5838d6f765a1ca9535b5d57c1299439040a5def2)

7 years agoAdd zaqar service for composable upgrade
Carlos Camacho [Mon, 20 Feb 2017 09:45:13 +0000 (10:45 +0100)]
Add zaqar service for composable upgrade

Change-Id: I316e14317e0586e895dcb4e084aa54e7665f6a20
(cherry picked from commit 2cebb99729005a31fbe24a957d2db84397f1952a)

7 years agoAdd support for upgrading ec2-api
Carlos Camacho [Wed, 25 Jan 2017 16:55:59 +0000 (17:55 +0100)]
Add support for upgrading ec2-api

Change-Id: I2703dd1a7e3eefa0ad6f7b74183101de6c1ad915
(cherry picked from commit b6214b0c5b92c85dbfa45007295db70888b509ab)

7 years agoMerge "Install openstack-panko-api on upgrade" into stable/ocata
Jenkins [Tue, 28 Feb 2017 15:23:08 +0000 (15:23 +0000)]
Merge "Install openstack-panko-api on upgrade" into stable/ocata

7 years agoAdds http proxy support for registering RHEL overcloud nodes
Vincent S. Cojot [Thu, 23 Feb 2017 04:50:05 +0000 (23:50 -0500)]
Adds http proxy support for registering RHEL overcloud nodes

It is quite common in large entreprises that direct HTTP/HTTPS to the outside
world is denied from nodes/systems but reaching out through a proxy is allowed.

This change adds support for an HTTP proxy when RHEL overcloud nodes reach
out to either the RHSM portal or to a satellite server. This allows the
overcloud nodes to download updates even in locked-down environments.

The following variables are settable through templates:
  rhel_reg_http_proxy_host:
  rhel_reg_http_proxy_port:
  rhel_reg_http_proxy_username:
  rhel_reg_http_proxy_password:

Note the following restrictions:
  - If setting rhel_reg_http_proxy_host,
    then rhel_reg_http_proxy_port cannot be empty.
  - If setting rhel_reg_http_proxy_port,
    then rhel_reg_http_proxy_host cannot be empty.
  - If setting rhel_reg_http_proxy_username,
    then rhel_reg_http_proxy_password cannot be empty.
  - If setting rhel_reg_http_proxy_password,
    then rhel_reg_http_proxy_username cannot be empty.
  - If setting either rhel_reg_http_proxy_username or
    rhel_reg_http_proxy_password, then rhel_reg_http_proxy_host
    AND rhel_reg_http_proxy_port cannot be empty

Closes-Bug: #1668618
Change-Id: I003ad5449bd99c01376781ec0ce9074eca3e2704
(cherry picked from commit 3002edc90a631f3adb8ae0ee696062347f94ea52)

7 years agoUpdated from global requirements
OpenStack Proposal Bot [Tue, 28 Feb 2017 06:24:02 +0000 (06:24 +0000)]
Updated from global requirements

Change-Id: I162ed6aa2d1039096e4a90e8678e48894a7119c3

7 years agoMerge "Update the Nova Endpoint information for Cinder" into stable/ocata
Jenkins [Mon, 27 Feb 2017 21:02:55 +0000 (21:02 +0000)]
Merge "Update the Nova Endpoint information for Cinder" into stable/ocata

7 years agoMerge "Don't recalculate EndpointMap to get outputs" into stable/ocata
Jenkins [Mon, 27 Feb 2017 21:02:48 +0000 (21:02 +0000)]
Merge "Don't recalculate EndpointMap to get outputs" into stable/ocata

7 years agoMerge "Install openstack-heat-agents on upgrade" into stable/ocata
Jenkins [Mon, 27 Feb 2017 21:02:10 +0000 (21:02 +0000)]
Merge "Install openstack-heat-agents on upgrade" into stable/ocata

7 years agoUpdate the Nova Endpoint information for Cinder
Rhys Oxenham [Wed, 22 Feb 2017 21:20:40 +0000 (16:20 -0500)]
Update the Nova Endpoint information for Cinder

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)

7 years agoMerge "Don't assume default network names in net_ip*map" into stable/ocata
Jenkins [Mon, 27 Feb 2017 13:26:23 +0000 (13:26 +0000)]
Merge "Don't assume default network names in net_ip*map" into stable/ocata

7 years agoDon't recalculate EndpointMap to get outputs
Zane Bitter [Fri, 3 Feb 2017 22:52:10 +0000 (17:52 -0500)]
Don't recalculate EndpointMap to get outputs

As of Ocata, whenever Heat needs to get the value of an output from a
nested Stack it will still load the Stack in memory and re-resolve the
output value. This means that the EndpointMap's endpoint_map output, which
is huge, gets loaded and recalculated whenever showing the EndpointMap or
KeystoneUrl outputs of the main (overcloud) stack. To avoid this, store the
value locally in an OS::Heat::Value resource. This means that the
EndpointMap will only be resolved once, during the stack create/update, and
the outputs can refer to that value.

Related-Bug: #1661728
Change-Id: Ia79eceeea309f5508713a310849f5d366a035430
Depends-On: If0f80cab94c28514d1569b1025362ab9d9d31512
(cherry picked from commit b2ee58c7f6883011b4ba8b387eedc63d3600aea0)

7 years agoInstall openstack-heat-agents on upgrade
Marius Cornea [Sat, 25 Feb 2017 20:02:01 +0000 (21:02 +0100)]
Install openstack-heat-agents on upgrade

This package wasn't installed in the Newton image and we need to
install it during upgrade to be able to skip preupgrade validations.

Change-Id: If6ee7a3801756ac445ae35534803eab175ad8e40
Closes-Bug: 1667967
(cherry picked from commit 96618f85e6b92a4d1d2413e72adafab2abcbddc6)

7 years agoInstall openstack-panko-api on upgrade
Marius Cornea [Sat, 25 Feb 2017 19:32:49 +0000 (20:32 +0100)]
Install openstack-panko-api on upgrade

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)

7 years agoDon't assume default network names in net_ip*map
Steven Hardy [Wed, 21 Dec 2016 13:19:20 +0000 (13:19 +0000)]
Don't assume default network names in net_ip*map

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)

7 years agoDeploy CI scenarios with Pacemaker
Emilien Macchi [Sun, 26 Feb 2017 19:18:30 +0000 (14:18 -0500)]
Deploy CI scenarios with Pacemaker

Pacemaker is now deployed by default and it would be great to have it
tested for all scenarios to deploy real environments used in production.

Change-Id: Iff879cd641f6207644b1b6309a6ec4129f1a255a
(cherry picked from commit 828788f1d17f5b14a058bf79aeafd526db842d9d)

7 years agoMerge "Adding the ip_conntrack_proto_sctp kernel module" into stable/ocata
Jenkins [Sun, 26 Feb 2017 20:21:08 +0000 (20:21 +0000)]
Merge "Adding the ip_conntrack_proto_sctp kernel module" into stable/ocata

7 years agoMerge "multinode_major_upgrade: enable Pacemaker" into stable/ocata
Jenkins [Sat, 25 Feb 2017 22:54:35 +0000 (22:54 +0000)]
Merge "multinode_major_upgrade: enable Pacemaker" into stable/ocata

7 years agoRemove forgotten sahara dbsync from step5 upgrades tasks
marios [Thu, 23 Feb 2017 08:53:05 +0000 (10:53 +0200)]
Remove forgotten sahara dbsync from step5 upgrades tasks

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)

7 years agomultinode_major_upgrade: enable Pacemaker
Emilien Macchi [Sat, 25 Feb 2017 15:53:53 +0000 (10:53 -0500)]
multinode_major_upgrade: enable Pacemaker

To improve testing coverage in upgrade CI job, add Pacemaker.

Change-Id: I855ed15642e28cdfda5a7cbd6ff6d01b591dff7e
(cherry picked from commit b352d687ba980eba5b492f5ef676bda20266794d)

7 years agoMerge "Upgrade nova-api/scheduler/conductor packages at step3 not step2." into stable...
Jenkins [Sat, 25 Feb 2017 00:13:27 +0000 (00:13 +0000)]
Merge "Upgrade nova-api/scheduler/conductor packages at step3 not step2." into stable/ocata

7 years agoUpgrade nova-api/scheduler/conductor packages at step3 not step2.
Sofer Athlan-Guyot [Fri, 24 Feb 2017 16:01:35 +0000 (17:01 +0100)]
Upgrade nova-api/scheduler/conductor packages at step3 not step2.

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)

7 years agoAlign HCI environment file with list of services from roles_data
Giulio Fidente [Thu, 16 Feb 2017 11:47:33 +0000 (12:47 +0100)]
Align HCI environment file with list of services from roles_data

Until we get bug #1635409 fixed we'll have to keep the two lists
in sync.

Change-Id: Ifd996bd4c95f901f242696b37e179073be6334d0
Related-Bug: #1635409
(cherry picked from commit 1a719a037df585a45e57316a2a20d6282fe5ba8b)

7 years agoAdd checks in ansible upgrade tasks for CephMon and CephOSD
Giulio Fidente [Fri, 17 Feb 2017 15:49:58 +0000 (16:49 +0100)]
Add checks in ansible upgrade tasks for CephMon and CephOSD

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)

7 years agoAdd release notes for Manila/CephFS with managed Ceph
Giulio Fidente [Thu, 26 Jan 2017 15:19:06 +0000 (16:19 +0100)]
Add release notes for Manila/CephFS with managed Ceph

Previously we could only configure Manila/CephFS with an externally
managed Ceph cluster. By adding CephMDS users can use the TripleO
managed Ceph cluster as well.

Change-Id: If714076e34a639c3df54936f335da4f2684b4533
(cherry picked from commit 9b70330a150b363c31b952867819e48830a10817)

7 years agoAdding the ip_conntrack_proto_sctp kernel module
Itzik Brown [Wed, 22 Feb 2017 14:58:30 +0000 (16:58 +0200)]
Adding the ip_conntrack_proto_sctp kernel module

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)

7 years agoMerge "Increase ansible-pacemaker default service start timeout" into stable/ocata
Jenkins [Thu, 23 Feb 2017 19:28:34 +0000 (19:28 +0000)]
Merge "Increase ansible-pacemaker default service start timeout" into stable/ocata

7 years agoMerge "Update ci environment for multinode jobs to support Ceph" into stable/ocata
Jenkins [Thu, 23 Feb 2017 17:45:49 +0000 (17:45 +0000)]
Merge "Update ci environment for multinode jobs to support Ceph" into stable/ocata

7 years agoMerge "multinode/upgrade: add nova services to environment" into stable/ocata
Jenkins [Thu, 23 Feb 2017 17:40:49 +0000 (17:40 +0000)]
Merge "multinode/upgrade: add nova services to environment" into stable/ocata

7 years agoIncrease ansible-pacemaker default service start timeout
marios [Tue, 21 Feb 2017 17:12:02 +0000 (19:12 +0200)]
Increase ansible-pacemaker default service start timeout

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)

7 years agoneutron: don't set external_network_bridge option by default
Ihar Hrachyshka [Tue, 6 Dec 2016 22:24:30 +0000 (22:24 +0000)]
neutron: don't set external_network_bridge option by default

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)

7 years agoRe-add the disable_upgrade_deployment note in roles_data.yaml
marios [Wed, 22 Feb 2017 10:59:22 +0000 (12:59 +0200)]
Re-add the disable_upgrade_deployment note in roles_data.yaml

This was accidentally removed in
If581f301a5493ef33ac1386bdc22f9fca4f2544e looks like

Change-Id: I0e2c4fe664daca5c50921673db067701195c501f
(cherry picked from commit f3772c6b0ab5550fc80c53b624d780a04545fbc6)

7 years agoMerge "Add step0,validation checks for heat services" into stable/ocata
Jenkins [Thu, 23 Feb 2017 07:45:26 +0000 (07:45 +0000)]
Merge "Add step0,validation checks for heat services" into stable/ocata

7 years agoMerge "Make the DB URIs host-independent for all services" into stable/ocata
Jenkins [Wed, 22 Feb 2017 19:34:15 +0000 (19:34 +0000)]
Merge "Make the DB URIs host-independent for all services" into stable/ocata

7 years agoUpdate ci environment for multinode jobs to support Ceph
Giulio Fidente [Thu, 16 Feb 2017 15:51:01 +0000 (16:51 +0100)]
Update ci environment for multinode jobs to support Ceph

Adds the CephMon and CephOSD services on the Controller role so
that we can test Ceph if the services are enabled via registry.

Change-Id: I73ee5380b88bf7643ba425a0c833922e330ecade
(cherry picked from commit 54438d35adc1d9e64f1b9c33793a58ddc181d31a)

7 years agoIncrease apache ServerLimit and workers to 100
Sagi Shnaidman [Tue, 21 Feb 2017 20:18:01 +0000 (22:18 +0200)]
Increase apache ServerLimit and workers to 100

Increase apache serverlimit and maxrequestworkers to 100
in low-memory-usage template.
We have been reaching the limit with all the OpenStack services that we run in WSGI.
Increasing the number will help us to promote packages in TripleO CI.

Change-Id: I3f71f279a8dfaee9db5f5d1091ad079d9170de1f
(cherry picked from commit 99f0b84983e8769bf975060fbf392cc1a8a28057)

7 years agoEnable panko service by default on overcloud
Pradeep Kilambi [Mon, 20 Feb 2017 13:00:55 +0000 (08:00 -0500)]
Enable panko service by default on overcloud

There are other applications still relying on panko and not
enabling by default is causing integration concerns.

Closes-bug: #1666619

Change-Id: I615694ca5f5a04fef4b0098c8083fb43432bb81f
(cherry picked from commit 161cd3cbe3b7b01bfa31dbca1a2f60284155cef7)

7 years agoAdd step0,validation checks for heat services
marios [Tue, 21 Feb 2017 14:08:27 +0000 (16:08 +0200)]
Add step0,validation checks for heat services

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)

7 years agoStop nova-api before upgrading package
Oliver Walsh [Mon, 20 Feb 2017 19:10:45 +0000 (14:10 -0500)]
Stop nova-api before upgrading package

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)

7 years agoMake the DB URIs host-independent for all services
Michele Baldessari [Thu, 9 Feb 2017 10:14:03 +0000 (11:14 +0100)]
Make the DB URIs host-independent for all services

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)

7 years agomultinode/upgrade: add nova services to environment
Emilien Macchi [Wed, 15 Feb 2017 15:23:52 +0000 (10:23 -0500)]
multinode/upgrade: add nova services to environment

Add Nova services to the environment that deploys the upgrade Ci job.

Change-Id: I4b98b433e5c56a35e42ba34c2f2e663a4cb79580

7 years agoSwitch to net-config-multinode
Emilien Macchi [Fri, 27 Jan 2017 19:39:35 +0000 (14:39 -0500)]
Switch to net-config-multinode

Because of this bug:
https://bugs.launchpad.net/tripleo/+bug/1661412

We are unable to upgrade from Newton.
Until we figure this out, let's re-enable the previous SoftwareConfig.

Change-Id: I966b96c50224656b152045c97aa23b9495618a18
(cherry picked from commit 4061dfe790f2614f253a6f0e14bf3dd056e20ce1)

7 years agoMerge "Apply post-upgrade step to not run puppet in post upgrade" into stable/ocata
Jenkins [Sat, 18 Feb 2017 02:04:40 +0000 (02:04 +0000)]
Merge "Apply post-upgrade step to not run puppet in post upgrade" into stable/ocata

7 years agoMerge "Apply puppet in non-controller script in step." into stable/ocata
Jenkins [Fri, 17 Feb 2017 21:53:27 +0000 (21:53 +0000)]
Merge "Apply puppet in non-controller script in step." into stable/ocata

7 years agoMerge "Deploy Manila with CephMDS in scenario004" into stable/ocata
Jenkins [Fri, 17 Feb 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Deploy Manila with CephMDS in scenario004" into stable/ocata

7 years agoMerge "Automatically backup and restore Swift rings from the undercloud" into stable...
Jenkins [Fri, 17 Feb 2017 19:13:52 +0000 (19:13 +0000)]
Merge "Automatically backup and restore Swift rings from the undercloud" into stable/ocata

7 years agoMerge "Add explicit swift check to tripleo_upgrade_node.sh" into stable/ocata
Jenkins [Fri, 17 Feb 2017 17:49:10 +0000 (17:49 +0000)]
Merge "Add explicit swift check to tripleo_upgrade_node.sh" into stable/ocata

7 years agoAdd explicit swift check to tripleo_upgrade_node.sh
marios [Wed, 15 Feb 2017 14:20:36 +0000 (16:20 +0200)]
Add explicit swift check to tripleo_upgrade_node.sh

And change the conditional to use hiera instead.

Change-Id: Icf91dd91c0ab04e7919172fcfd130183bfd427b4
(cherry picked from commit d8e75b220efec3b17a76bed6898327784fb4e6cc)

7 years agoDeploy Manila with CephMDS in scenario004
Giulio Fidente [Fri, 20 Jan 2017 17:25:32 +0000 (18:25 +0100)]
Deploy Manila with CephMDS in scenario004

Adds the Manila and CephMDS services into scenario004 and a few
resources in the pingtest to test the Manila deployment.

Also adds Pacemaker to scenario004 which is needed for ManilaShare.

Co-Authored-By: jprovazn@redhat.com
Change-Id: I70515c5b9ce2668a684649ecd40421b69078ee83
Related-Bug: #1644784
(cherry picked from commit db58ec86c748a99efb427a8b37ee4a514f7acdaf)