diff --git a/tests/run.yml b/tests/run.yml
index f9be0bf85fbf9221fc902288d6875a612e458f84..6bc8e936061f6f2fd99e67d0ba6522eb684db10c 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -94,11 +94,14 @@
state: directory
become: true
+ # TODO(mnasiadka): remove cinder and glance in Victoria
- name: Ensure configuration directories exist
file:
path: "/etc/kolla/config/{{ item }}"
state: directory
loop:
+ - cinder
+ - glance
- nova
- bifrost
- swift
@@ -141,6 +144,22 @@
- src: "tests/templates/ceph-ansible.j2"
dest: /etc/kolla/ceph-ansible.yml
when: "{{ scenario == 'ceph-ansible' }}"
+
+ ### TODO(mnasiadka): Remove following ceph-ansible block in Victoria
+ # external ceph: glance-api.conf on upgrade from Train
+ - src: "tests/templates/ceph-ansible-upgrade/glance-api.conf.j2"
+ dest: /etc/kolla/config/glance/glance-api.conf
+ when: "{{ scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' }}"
+ # external ceph: cinder-volume.conf on upgrade from Train
+ - src: "tests/templates/ceph-ansible-upgrade/cinder-volume.conf.j2"
+ dest: /etc/kolla/config/cinder/cinder-volume.conf
+ when: "{{ scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' }}"
+ # external ceph: cinder-backup.conf on upgrade from Train
+ - src: "tests/templates/ceph-ansible-upgrade/cinder-backup.conf.j2"
+ dest: /etc/kolla/config/cinder/cinder-backup.conf
+ when: "{{ scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' }}"
+ ### TODO(mnasiadka): End of remove block for ceph-ansible in Victoria
+
when: item.when | default(true)
- block:
@@ -426,6 +445,16 @@
git log --pretty=oneline -1
chdir: "{{ kolla_ansible_src_dir }}"
+ # TODO(mnasiadka): Remove in Victoria
+ - name: Remove not needed external ceph required configs
+ file:
+ name: "{{ item }}"
+ state: absent
+ with_items:
+ - /etc/kolla/config/glance/glance-api.conf
+ - /etc/kolla/config/cinder/cinder-volume.conf
+ - /etc/kolla/config/cinder/cinder-backup.conf
+
- name: Generate configuration files
template:
src: "{{ kolla_ansible_local_src_dir }}/{{ item.src }}"
diff --git a/tests/templates/ceph-ansible-upgrade/cinder-backup.conf.j2 b/tests/templates/ceph-ansible-upgrade/cinder-backup.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..d5ec5d2abfd264c96f3289d4467ccfd8dd8167c2
--- /dev/null
+++ b/tests/templates/ceph-ansible-upgrade/cinder-backup.conf.j2
@@ -0,0 +1,10 @@
+{# TODO(mnasiadka): Remove in Victoria #}
+[DEFAULT]
+backup_ceph_conf=/etc/ceph/ceph.conf
+backup_ceph_user=cinder-backup
+backup_ceph_chunk_size = 134217728
+backup_ceph_pool=backups
+backup_driver = cinder.backup.drivers.ceph.CephBackupDriver
+backup_ceph_stripe_unit = 0
+backup_ceph_stripe_count = 0
+restore_discard_excess_bytes = true
diff --git a/tests/templates/ceph-ansible-upgrade/cinder-volume.conf.j2 b/tests/templates/ceph-ansible-upgrade/cinder-volume.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..354c81d08e12ee62407a1e0a2b979f6545aaea3a
--- /dev/null
+++ b/tests/templates/ceph-ansible-upgrade/cinder-volume.conf.j2
@@ -0,0 +1,15 @@
+{# TODO(mnasiadka): Remove in Victoria #}
+
+[DEFAULT]
+enabled_backends=rbd-1
+
+[rbd-1]
+rbd_ceph_conf=/etc/ceph/ceph.conf
+rbd_user=cinder
+backend_host=rbd:volumes
+rbd_pool=volumes
+volume_backend_name=rbd-1
+volume_driver=cinder.volume.drivers.rbd.RBDDriver
+{% raw %}
+rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
+{% endraw %}
diff --git a/tests/templates/ceph-ansible-upgrade/glance-api.conf.j2 b/tests/templates/ceph-ansible-upgrade/glance-api.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..bdefc2aa704fe7f6aed387c522fe95f0322c7555
--- /dev/null
+++ b/tests/templates/ceph-ansible-upgrade/glance-api.conf.j2
@@ -0,0 +1,8 @@
+{# TODO(mnasiadka): Remove in Victoria #}
+
+[glance_store]
+stores = rbd
+default_store = rbd
+rbd_store_pool = images
+rbd_store_user = glance
+rbd_store_ceph_conf = /etc/ceph/ceph.conf
diff --git a/tests/templates/nova-compute-overrides.j2 b/tests/templates/nova-compute-overrides.j2
index 665435f938cebc98f9d098f9b6b44b4e75372f49..4987afca97219e38975ade4ad708acae8716abfe 100644
--- a/tests/templates/nova-compute-overrides.j2
+++ b/tests/templates/nova-compute-overrides.j2
@@ -2,3 +2,12 @@
virt_type=qemu
# NOTE(Jeffrey4l): fix the gate in iax-ord nodes for libvirt 2.0.
cpu_mode=none
+
+{# TODO(mnasiadka): Remove in Victoria #}
+{% if scenario == 'ceph-ansible' and is_previous_release %}
+[libvirt]
+images_rbd_pool=vms
+images_type=rbd
+images_rbd_ceph_conf=/etc/ceph/ceph.conf
+rbd_user=nova
+{% endif %}
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 30662ea0044ae6ee6cea214872d752efca3c6b3b..57862be2c86547398a02ab17bed84922cc3ef70d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -167,6 +167,26 @@
install_type: source
is_upgrade: yes
+- job:
+ name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible
+ parent: kolla-ansible-ceph-ansible-base
+ nodeset: kolla-ansible-bionic-multi
+ timeout: 9000
+ vars:
+ base_distro: ubuntu
+ install_type: source
+ is_upgrade: yes
+
+- job:
+ name: kolla-ansible-centos-source-upgrade-ceph-ansible
+ parent: kolla-ansible-ceph-ansible-base
+ nodeset: kolla-ansible-centos-multi
+ timeout: 9000
+ vars:
+ base_distro: centos
+ install_type: source
+ is_upgrade: yes
+
- job:
name: kolla-ansible-bifrost-centos-source
parent: kolla-ansible-bifrost-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b315ba7fb83b059d9dfdee6bd664ec605d0710f9..fa73906c1aa0fa0cd3f7c56a0f375aec062fca3f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -41,6 +41,8 @@
- kolla-ansible-ubuntu-source-mariadb
- kolla-ansible-centos-source-ceph-ansible
- kolla-ansible-ubuntu-source-ceph-ansible
+ - kolla-ansible-centos-source-upgrade-ceph-ansible
+ - kolla-ansible-ubuntu-source-upgrade-ceph-ansible
check-arm64:
jobs:
- kolla-ansible-debian-source-aarch64