Commit Graph

3741 Commits

Author SHA1 Message Date
Steven Hardy
a5116005d8 Add network_data.yaml to encapsulate list of networks for j2
This moves the hard-coded networks from the default environment,
and provides the first step towards enabling composable networks.

Co-Author: Dan Sneddon <dsneddon@redhat.com>
Partial-Bug: #1633090
Depends-On: I9f818912bd8e2a3220e41c8ccbbab3d9063b4d72
Change-Id: I7793b8badede5450b05437c84d9b40c28de7546b
2017-03-05 03:20:42 +00:00
Jenkins
ccb13e7b42 Merge "etcd: Get FQDN from hiera instead of puppet fact" 2017-03-04 11:32:20 +00:00
Jenkins
10f33e311a Merge "Fix httpd dir create to not error if exists" 2017-03-03 22:09:43 +00:00
Jenkins
81b7fc658c Merge "Fix Panko API upgrade process" 2017-03-03 15:04:51 +00:00
Pradeep Kilambi
9bbd43b3e7 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
2017-03-03 12:58:37 +00:00
Jenkins
941ddf8003 Merge "Enable IronicPxe in the undercloud" 2017-03-03 12:53:46 +00:00
Jenkins
8e527190af Merge "Removes opencontrail reference" 2017-03-03 11:48:34 +00:00
Juan Antonio Osorio Robles
1792712f32 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
2017-03-03 11:08:38 +02:00
Emilien Macchi
480baa3ce1 Fix Panko API upgrade process
Upgrade process wasn't consistent and correct.

Change-Id: Id1f810d33c2909957be9a2c96d18c96dee939953
2017-03-02 22:24:52 -05:00
Jenkins
cee8160ee5 Merge "Make UpdateDeployment depend on NetworkDeployment" 2017-03-02 23:31:43 +00:00
Dan Prince
151d614ab3 Enable IronicPxe in the undercloud
This enables the IronicPxe services which are split out
into separate templates for the containerized undercloud.

Change-Id: I0ec3cefec9b47ef3c59de6972541ef9b560aacb7
2017-03-02 15:11:10 -05:00
Jenkins
b6c74c47aa Merge "Add plan-environment.yaml" 2017-03-02 18:47:35 +00:00
Christopher Brown
3c441842dd Removes opencontrail reference
The opencontrail environment file was removed in commit da91bb6
so this is no longer required

Change-Id: I835dc665ede7fdb50d5be2c3251b8acf20c3ce37
2017-03-02 16:55:14 +00:00
Jenkins
e82e8d23ab Merge "Add upgrade task for panko api" 2017-03-02 14:01:32 +00:00
Jenkins
ebd73c0b09 Merge "Upgrades: fix up the rabbitmq HA mode like in new ocata deployments" 2017-03-02 12:21:15 +00:00
Pradeep Kilambi
7273a3de02 Add upgrade task for panko api
Change-Id: Icc5fbf99301ae47344e1582767e1e7a4687f491b
2017-03-02 11:49:17 +01:00
Jenkins
ba26d2dbab Merge "Add mistral service support for composable upgrades" 2017-03-02 09:49:44 +00:00
Jenkins
6c24b0a159 Merge "upgrades/validation: only run validation when services exist" 2017-03-02 09:49:37 +00:00
Michele Baldessari
41514d0cd6 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
2017-03-02 08:46:54 +01:00
Jenkins
09794f09aa Merge "Containerize neutron-l3 agent" 2017-03-01 23:18:08 +00:00
Jenkins
ebee7ecfa7 Merge "Associate unmapped hosts with cell mappings" 2017-03-01 19:54:00 +00:00
Steven Hardy
dedef90750 Add mistral service support for composable upgrades
Change-Id: I189edaf69c0e97a3399e6af939595f98322d7c03
Partially-Implements: blueprint overcloud-upgrades-per-service
2017-03-01 19:53:12 +00:00
Emilien Macchi
7c84a9b390 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
2017-03-01 19:49:00 +00:00
John Trowbridge
c5931fdf1e Containerize neutron-l3 agent
This allows to run a containerized neutron on the overcloud.

Co-Authored-By: Martin André <m.andre@redhat.com>
Depends-On: Iaf6536b1c4d0b2b118af92295136378cdfeee9d1
Change-Id: I86a12248d4f28f4dbe7708be928bcd8a45968d01
2017-03-01 15:54:55 +00:00
John Trowbridge
b8695b8b2e Associate unmapped hosts with cell mappings
Otherwise the containerized nova running in the overcloud fails with
"Host 'overcloud-novacompute-0' is not mapped to any cell, Code: 400".

Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I9ff77f25bfd1f37167b0638a32fe5049951bc5b4
2017-03-01 16:37:46 +01:00
Jenkins
b889a4b5b3 Merge "Disable exit on error for pacemaker commands for update flow" 2017-03-01 14:42:02 +00:00
Jenkins
de1637bdd1 Merge "Switch to dict format for docker_puppet_tasks" 2017-03-01 11:56:31 +00:00
Ana Krivokapic
e405a74048 Add plan-environment.yaml
This file is needed for plan import and export features. We want to enable the
user to store the selection of environment options, so that it can be
re-imported, and it does not have to be perfmed manually multiple times.

The plan create workflow will look into the Swift
container for this file, and import its contents into the Mistral
environment. Conversely, plan export will create this file from the Mistral
environment contents, so that it can later be re-imported.

For more information, see the related blueprint, and the spec at
https://specs.openstack.org/openstack/tripleo-specs/specs/ocata/gui-plan-import-export.html

Partially implements: blueprint enhance-plan-creation-with-plan-environment

Change-Id: I95e3e3a25104623d6fcf38e99403cebbd591b92d
2017-03-01 12:44:24 +01:00
Jenkins
d0d3403854 Merge "Adding keystone parameters for Tacker" 2017-03-01 11:06:04 +00:00
Jenkins
378d831ebf Merge "Add etcd composable upgrade steps" 2017-03-01 11:05:52 +00:00
Jenkins
ea238df9de Merge "Align hyperconverged-ceph.yaml environment and adds some validation" 2017-03-01 11:05:45 +00:00
Jenkins
6c8f5017d7 Merge "Put service stop at step1 and quiesce at step2." 2017-03-01 10:09:53 +00:00
Steven Hardy
626b820b57 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
2017-03-01 09:51:20 +00:00
Jenkins
d8aa952a75 Merge "Use --disable= in subscription-manager to avoid shell expansion." 2017-03-01 05:28:41 +00:00
Jenkins
236a27a1ff Merge "upgrades: fix ec2api conditional" 2017-03-01 03:56:03 +00:00
Steve Baker
93561bde0a Switch to dict format for docker_puppet_tasks
This change gives the option of docker-puppet.py data to be in a dict
as well as a list. This allows docker_puppet_tasks data to use the
same keys as the top level puppet config data.

If the yaql fu can be worked out to build the top level data,
docker-puppet.py can later drop the list format entirely.

Change-Id: I7e2294c6c898d2340421c93516296ccf120aa6d2
2017-03-01 03:14:49 +00:00
Jenkins
c992dcf51a Merge "mysqlclient: Use actual parameter in puppet to set bind-address" 2017-03-01 01:06:57 +00:00
Jenkins
b15756b8a1 Merge "Adding keystone parameters for Congress" 2017-03-01 01:06:09 +00:00
Vincent S. Cojot
87569bd571 Use --disable= in subscription-manager to avoid shell expansion.
In extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration,
there's a line that says:

   retry subscription-manager repos --disable '*'

I believe this is broken and will result in shell expansion being made.
The proper line should be:

   retry subscription-manager repos --disable='*'

This regression came from commit 2b06ed8adc.
(Also see https://review.openstack.org/#/c/381233 )

This patch fixes the regression while preserving functionality
of the above change.

Closes-Bug: 1667316

Change-Id: I54f0db3f1f596f6356f7445cdc61737f20f14318
Signed-off-by: Vincent S. Cojot <vincent@cojot.name>
2017-02-28 20:04:36 -05:00
Saravanan KR
e9a2fdc0af 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
2017-03-01 00:44:15 +05:30
Sofer Athlan-Guyot
fb78213782 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
2017-02-28 19:20:13 +01:00
Emilien Macchi
d54532679e 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
2017-02-28 19:20:13 +01:00
Giulio Fidente
6ff979aa75 Align hyperconverged-ceph.yaml environment and adds some validation
Until bug #1635409 is fixed we'll have to keep the default list
of services deployed by hyperconverged-ceph.yaml in sync with the
ServicesDefault list provided in roles_data.yaml

This change adds some logic in the templates validation script to
ensure that is preserved with future updates.

Change-Id: Ib767f9a24c3541b16f96bd6b6455cf797113fbd8
2017-02-28 18:55:55 +01:00
Jenkins
8431fa153b Merge "Switch central and compute templates to use polling agent" 2017-02-28 16:09:58 +00:00
Dan Radez
a9c64bd39d Adding keystone parameters for Tacker
Change-Id: I256d2fcb6353d029750113c1fec59a89c82583ca
2017-02-28 10:59:32 -05:00
Jenkins
86fe8bf7e6 Merge "Add auditd upgrate steps" 2017-02-28 15:23:21 +00:00
Jenkins
73a3eb9be5 Merge "Add zaqar service for composable upgrade" 2017-02-28 15:23:14 +00:00
Jenkins
8728c06bf4 Merge "Add upgrade support for Horizon" 2017-02-28 15:18:41 +00:00
Jenkins
360ca9fe58 Merge "Add support for upgrading ec2-api" 2017-02-28 14:32:40 +00:00
Dan Radez
242fd3072d Adding keystone parameters for Congress
Change-Id: Ic50aee9e635f62f06fa757fa3d88d9d8c5b28fcb
2017-02-28 09:17:37 -05:00