1037 Commits

Author SHA1 Message Date
zhulingjie
8be12b71d7 use include_tasks and import_playbook instead of include
include is marked as deprecated since ansible 2.4[0]

Switch to include_tasks or import_playbook as necessary

[0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated

Change-Id: Ia1b826ca08ae042eec80f8c495ab030a087d97ba
2019-01-18 12:22:38 +00:00
Zuul
bf3d31aaa2 Merge "Perform ironic online data migrations prior to seed upgrade" 2019-01-07 11:54:24 +00:00
Zuul
45c4e09f9f Merge "Quote and escape extra vars passed to ansible" 2019-01-04 16:54:04 +00:00
Zuul
2c63dfdf8b Merge "Update manage-lvm role to v0.1.4" 2019-01-04 15:09:23 +00:00
Zuul
384630f062 Merge "Add check of pip install in the virtualenv" 2019-01-04 12:20:42 +00:00
Pierre Riteau
1a3de5e799 Update manage-lvm role to v0.1.4
This role now expects disks to be passed as a list instead of a
comma-separated string.

This commit updates group variables to stop transforming disk lists to
comma-separated strings and adds a check for users overriding LVM
variables. The playbook is also tagged as upgrade-check.

Change-Id: Ia8001c28a8be034ae79a1c584beb40bc66891db3
2019-01-04 11:55:15 +00:00
Mark Goddard
950bcb165f Perform ironic online data migrations prior to seed upgrade
Bifrost does not perform ironic online data migrations after upgrading. This
can lead to the following error during kayobe seed service upgrade:

The database is not compatible with this release of ironic (10.1.7). Please run
"ironic-dbsync online_data_migrations" using the previous release.

As a workaround, perform the migrations in kayobe, prior to performing the
upgrade.

Change-Id: I8951242ba40158c26e85377254d19085d85cf753
Story: 2004308
Task: 28657
2018-12-24 14:39:01 +00:00
Mark Goddard
7593a8b925 Test upgrading seed services in CI
Adds the kayobe-seed-upgrade-centos job, which performs an upgrade of
the seed services from the previous release to the current release.

Change-Id: Ia3eb39cf81cb3618fd94c4456bd576b52098c946
Story: 2004308
Task: 27873
2018-12-21 15:21:47 +00:00
Mark Goddard
6496af1f67 Add kayobe seed service upgrade command
Adds a new command to upgrade containerised services on the seed:

kayobe seed service upgrade

This is largely the same as the deploy command, since there is no
kolla-ansible bifrost-upgrade command yet.

A limitation in Bifrost requires us to remove IPA images before
upgrading the bifrost container.

Change-Id: Ibbe01e972487e69dbb753a67efcf13e3ae0800de
Story: 2004308
Task: 27872
2018-12-21 15:21:30 +00:00
Mark Goddard
bff985330a Generate bifrost hostvars prior to provisioning
The 'kayobe overcloud inventory discover' command can be used to discover an
overcloud inventory from the nodes in the ironic service running on the seed.
This works well for cases where the nodes have been autodiscovered, and as such
do not exist in the kayobe inventory.

There is another use case where overcloud nodes already exist in the kayobe
inventory. In that case we don't want to run the above command, as it will
create duplicate hosts in the inventory. We do however want the part of that
command that generates bifrost host variables for the overcloud nodes.

This change moves the generation of bifrost host variables to the 'kayobe
overcloud provision' and 'kayobe overcloud hardware inspect' commands,
which are used in each of these cases.

Change-Id: I8a69ccd5192c0c5beeb7efb36c09b2c4643ef150
Story: 2004426
Task: 28079
2018-12-20 17:03:17 +00:00
Mark Goddard
411340b005 Fix bifrost automation tasks for Rocky
Changes to the openstack ansible modules and client SDKs have rendered our
authentication for ironic invalid. Bifrost now provides a working clouds.yaml,
so use this instead of the fudged endpoint/token setup in env-vars.

Also updates some use of the ironic client to the openstack client, and adds
support for the new 'inspect wait' ironic state to avoid surprises during
inspection.

Change-Id: I15ea388b6df8ced9cc0e0eceed8dec8aa8f57a9b
Story: 2001864
Task: 28078
2018-12-20 17:03:16 +00:00
Mark Goddard
8dc7ba7889 Use host vars files for kolla ansible inventory
Kayobe writes out several host variables to the Kolla ansible inventory
files, etc/kolla/inventory/seed and etc/kolla/inventory/overcloud. These
include ansible_host, and network interfaces such as api_interface,
ironic_dnsmasq_interface, etc.

In Ansible, these should have a higher precedence than the kolla ansible
group variables in ansible/group_vars/all.yml that set the defaults.
However, in Ansible 2.4+, if the host has the same name as a group that
it is in, the group variables now take precedence, meaning that it is
not possible to override them.

This was observed when using the kayobe-config-dev repo for testing,
where the seed host is in the seed group.

Admittedly ansible does tell you not to do this: [WARNING]:
Found both group and host with same name: localhost

The solution used here is to use a separate host_vars file for each
host. Alternatively we could enforce that hostnames and groups do not
overlap.

Change-Id: I349c8279d85a591689ac8108bce14d96889440fe
Story: 2004418
Task: 28065
2018-12-20 17:03:16 +00:00
Zuul
62aa5d015f Merge "Make seed deploy job voting again" 2018-12-20 16:43:18 +00:00
Pierre Riteau
4bd6dfecba Remove documentation and use of dell_switch_delegate_to
The dell_switch_delegate_to parameter was removed from the dell-switch
role in commit da75d6b734fa0451738993d4d6c9beab9b4640b2.

Change-Id: Ia70d48d417d68140ea9e3abd1409c6b0945e638c
2018-12-19 13:05:01 +01:00
Zuul
b56bd25f65 Merge "Retry adding custom repos until success" 2018-12-17 13:40:52 +00:00
Zuul
b6a2fe0db8 Merge "Fix physical network configuration on Dell switches" 2018-12-17 11:17:16 +00:00
Zuul
4d6f809a7f Merge "Fix variable shadowing" 2018-12-13 19:51:01 +00:00
Pierre Riteau
c7743aa615 Fix physical network configuration on Dell switches
The dellos Ansible modules do not accept a `transport` key in the
provider parameter anymore, even in Ansible 2.4.0.

Change-Id: I4bdaa337cb9c6cb93f36338a191a9aa78e2c13f0
Story: 2004588
Task: 28464
2018-12-13 15:40:43 +00:00
Zuul
044573ad9c Merge "Use public FQDN for OS_AUTH_URL in public-openrc.sh" 2018-12-13 14:14:29 +00:00
Zuul
47bda55139 Merge "Fix reference to Kolla-Ansible inventory" 2018-12-12 19:27:41 +00:00
Pierre Riteau
c6764f557f Use public FQDN for OS_AUTH_URL in public-openrc.sh
If a public FQDN is defined, use it instead of the virtual IP address.
When using TLS, certificates are generally tied to a hostname rather
than to an IP address.

Change-Id: I0afef32a0f4030bba613febdf266e2ccd863512d
2018-12-10 10:18:57 +00:00
Zuul
66d9b08853 Merge "Remove tasks for Ansible <= 2.3" 2018-12-08 20:27:01 +00:00
Zuul
d57b43f69d Merge "Update grafana-conf role" 2018-12-07 22:55:42 +00:00
Mark Goddard
09bcc6f28d Make seed deploy job voting again
The upstream fix to bifrost is now included in the rocky kolla images.

Change-Id: I0ca2e0a2d07a7be7d570ed63fceb2e82cf2d6173
2018-12-07 16:18:10 +00:00
Pierre Riteau
058a1351e3 Fix reference to Kolla-Ansible inventory
Change-Id: Iae19672b2ec7e2a9fe39d412f16d0c1a41c0bc99
2018-12-05 16:25:00 +00:00
Kevin Tibi
6586612467 Add check of pip install in the virtualenv
Change-Id: Ic392848900e42338cac6c1880c9ad2a1ba09c240
Story: 2004510
2018-12-05 11:06:26 +01:00
Vieri
6bd3001863 Change openstack-dev to openstack-discuss
Mailinglists have been updated. Openstack-discuss replaces openstack-dev.

Change-Id: I8eb686e42cb88cd5f47f0e1af20e746baa0e50c0
2018-12-05 03:44:01 +00:00
Doug Szumski
d2213de1dd Update grafana-conf role
Ansible Galaxy switched to semantic versioning. In order to get it
to import the latest release, a tag following this scheme was added
after a minor update to the grafana-conf role. This appears to have
broken the accessibility of the original version. This commit moves
to the later release to work around the issue.

Change-Id: I5a0ba9e18bc5db54f899b545b88c319c7922bf9e
2018-12-04 17:54:26 +00:00
Zuul
4244a8d7a6 Merge "Reorganise administration guide into sections" 2018-12-04 17:01:26 +00:00
Mark Goddard
e6cf6ca985 Remove tasks for Ansible <= 2.3
The minimum version of ansible is 2.4, so these tasks are no longer
required.

Change-Id: Ied933d18e438955c23ad3eeff80e3377b5633a7c
2018-11-29 15:50:35 +00:00
Zuul
e103d455ee Merge "Bump Ansible to 2.6.x" 2018-11-29 00:31:14 +00:00
Zuul
c3ec38632e Merge "Make ansible_host optional for all switch types" 2018-11-28 13:46:53 +00:00
Mark Goddard
72ce93dbfe Reorganise administration guide into sections
The administration guide has become a bit bloated, and not well
organised. This change creates new subsections within it.

Change-Id: I8aa133c183fb6b7d87a86d5ab66cc7faa5e64112
Story: 2004337
Task: 28082
2018-11-28 13:41:49 +00:00
Zuul
91566b0f12 Merge "Add commands to enable and disable the serial console" 2018-11-27 19:49:08 +00:00
Mark Goddard
ae340128e6 Make ansible_host optional for all switch types
The Juniper device support allows ansible_host variable to not be set
for a switch, in which case the inventory_hostname will be used instead.

This change applies this default consistently across all switch types.

Change-Id: Ibc1e673a6b988f2e8d7bb6c62d30ccdb7ce96351
Story: 2004358
Task: 27958
2018-11-27 18:56:27 +00:00
Zuul
3df008fdc4 Merge "Add documentation about physical network config" 2018-11-27 18:53:45 +00:00
Zuul
2aeb134390 Merge "Add release.sh, a script for creating releases" 2018-11-27 18:53:44 +00:00
Zuul
9120e74e9f Merge "Add --quiet flag to CI diagnostics collection" 2018-11-27 17:04:43 +00:00
Zuul
a3c1034ffd Merge "Add support for a custom octavia.conf file" 2018-11-27 17:04:42 +00:00
Mark Goddard
e9157c09e9 Fix variable shadowing
previous_release variable is used for two different purposes in Zuul config.
Rename one to reflect its flagginess.

Change-Id: Ib7833b29ab2959db7c7ff85b90fb8a4f5082d864
2018-11-27 14:24:33 +00:00
Ross Martyn
73fb8c39c8 Added manila.conf details to kolla-ansible documentation
This small update is to show users where to put their manila
configuration file for kolla-ansible.

Change-Id: I050bb6e388c8b82de05e4deeaa357b98525c004e
Story: 2004414
Task: 28058
2018-11-27 07:52:33 +00:00
Zuul
587f13e3fc Merge "Enable manila extra config merge #28058" 2018-11-26 17:53:32 +00:00
Ross Martyn
46e40301f8 Enable manila extra config merge #28058
This commit enables the merge of additional manila.conf
as seen with the other projects.

Change-Id: Ia2209a9c82215e49f1ef5a79ecafbebf2b204627
Closes-Bug: 28058
2018-11-23 17:37:24 +00:00
Zuul
70dba6ca5d Merge "Move group_vars for switches group to all group" 2018-11-22 21:37:26 +00:00
Zuul
c19a58ac03 Merge "Seed hypervisor user bootstrapping skipped" 2018-11-22 21:36:45 +00:00
Zuul
97fad9ff60 Merge "Bump zuul job timeouts" 2018-11-22 21:36:44 +00:00
Zuul
408ec30f80 Merge "Save previous kayobe & kolla configuration" 2018-11-22 19:42:09 +00:00
Nick Jones
3d1018dea9
Add support for a custom octavia.conf file
Kayobe should be able to handle extra configuration options in Octavia's
main configuration file, in a similar fashion to other services.  This
commit adds support for just that.

TrivialFix

Change-Id: Ibd91a90a5278bcd8963fb06874a74f71b1882d89
2018-11-22 18:55:54 +00:00
Will Szumski
a2dd79f8b1 Retry adding custom repos until success
Previously we checked for false in the result. The behavior
of Ansible has probably changed, as failed is always in the
result dictionary - just with the value "false". Tested
with Ansible 2.5.11.

Change-Id: Idfa2f33dd6641031ea8a287d74b6dbbfa578c9ab
2018-11-22 10:53:07 +00:00
Mark Goddard
0e329810a6 Bump zuul job timeouts
We are seeing a few overcloud deploy/upgrade jobs timing out. The jobs
appear to be progressing, so killing them isn't particularly helping.
Minimal random sampling suggests this affects the OVH cloud.

Change-Id: Ibce5457edf7a5f06e834aa587b5d4b5b6c69b8b6
2018-11-21 19:02:12 +00:00