diff options
| author | wu.chunyang <wuchunyang@yovole.com> | 2021-05-17 19:55:54 +0800 |
|---|---|---|
| committer | Michal Arbet <michal.arbet@ultimum.io> | 2021-09-30 18:56:14 +0200 |
| commit | 1f71df1a8b32b8b849ca0f031f44383f4cdfc828 (patch) | |
| tree | 868214d29bcd431aa9d8a5d6321204f2cfe776db /tests | |
| parent | bfba65f286bfd6c142146e1792b2cbcd62370d30 (diff) | |
| download | kolla-ansible-1f71df1a8b32b8b849ca0f031f44383f4cdfc828.tar.gz kolla-ansible-1f71df1a8b32b8b849ca0f031f44383f4cdfc828.zip | |
Remove chrony role from kolla
chrony is not supported in Xena cycle, remove it from kolla
Moved tasks from chrony role to chrony-cleanup.yml playbook to avoid a
vestigial chrony role.
Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Change-Id: I5a730d55afb49d517c85aeb9208188c81e2c84cf
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/globals-default.j2 | 7 | ||||
| -rw-r--r-- | tests/templates/inventory.j2 | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 3aa8f2793..94ef7683d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -33,7 +33,8 @@ enable_openstack_core: "{{ openstack_core_enabled }}" enable_horizon: "{{ dashboard_enabled }}" enable_heat: "{{ openstack_core_tested }}" -{% if is_previous_release and scenario != "cephadm" %} +# TODO(mgoddard): Remove when previous release is Xena. +{% if is_previous_release and previous_release == "wallaby" and scenario != "cephadm" %} # NOTE(mnasiadka): Test chrony cleanup in upgrade jobs enable_chrony: "yes" {% endif %} @@ -129,10 +130,6 @@ glance_backend_ceph: "yes" cinder_backend_ceph: "yes" nova_backend_ceph: "yes" -# TODO(yoctozepto): Remove this in the Xena cycle. -# cephadm doesn't support chrony in a container (checks for chrony.service) -enable_chrony: "no" - enable_ceph_rgw: {{ not is_upgrade or previous_release != 'wallaby' }} ceph_rgw_hosts: {% for host in hostvars %} diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index e323a78b7..bef80fbb8 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -97,16 +97,6 @@ compute storage monitoring -[chrony-server:children] -loadbalancer - -[chrony:children] -control -network -compute -storage -monitoring - [collectd:children] compute |