Merge "CI: drop pre-ussuri upgrade support"

tests/pre.yml

@@ -35,20 +35,6 @@
           - python3-wheel
       become: true
 
-    # FIXME(hrw): drop when previous_release == ussuri
-    - name: Install Python2 modules for stable/train
-      package:
-        name:
-          - python-pip
-          - python-setuptools
-          - python-virtualenv
-          - python-wheel
-      become: true
-      when:
-        - is_upgrade
-        - previous_release == 'train'
-        - not (ansible_os_family == "RedHat" and ansible_distribution_major_version | int == 8)
-
     # NOTE(hrw): On RedHat systems it is part of python3-virtualenv
     - name: Install virtualenv on Debian systems
       package:

tests/run.yml

@@ -23,8 +23,6 @@
         openstack_core_enabled: "{{ openstack_core_enabled }}"
         openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift', 'linuxbridge', 'ovn'] }}"
         dashboard_enabled: "{{ openstack_core_enabled }}"
-        # TODO(mgoddard): Remove when previous_release is ussuri.
-        playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and ansible_os_family != 'RedHat' else '3' }}"
         upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
         docker_image_tag_suffix: "{{ '-aarch64' if ansible_architecture == 'aarch64' else '' }}"
 
@@ -151,21 +149,6 @@
           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:
@@ -201,14 +184,12 @@
           - "{{ kolla_ansible_src_dir }}"
           - "ansible{{ ansible_version_constraint }}"
           - "ara<1.0.0"
-        # TODO(mgoddard): Always use pip3 when previous_release is ussuri.
+        executable: "pip3"
-        executable: "pip{{ playbook_python_version }}"
         extra_args: "-c {{ upper_constraints_file }}"
       become: true
 
-    # TODO(mgoddard): Always use python3 when previous_release is ussuri.
     - name: get ARA callback plugin path
-      command: "python{{ playbook_python_version }} -m ara.setup.callback_plugins"
+      command: "python3 -m ara.setup.callback_plugins"
       changed_when: false
       register: ara_callback_plugins
 
@@ -507,41 +488,6 @@
               dest: /etc/kolla/config/nova/nova-compute.conf
           when: item.when | default(true)
 
-        # TODO(mgoddard): Remove this block when previous_release is ussuri.
-        - block:
-            - name: remove ansible and ARA for python 2
-              pip:
-                name:
-                  - ansible
-                  - ara
-                executable: pip2
-                state: absent
-              become: true
-              when: playbook_python_version == '2'
-
-            - name: install ansible and ARA for python 3
-              vars:
-                # Test latest ansible version on Ubuntu, minimum supported on others.
-                ansible_version_constraint: "{{ '==2.9.*,!=2.9.8' if base_distro == 'ubuntu' else '==2.8.*' }}"
-              pip:
-                name:
-                  - "ansible{{ ansible_version_constraint }}"
-                  - "ara<1.0.0"
-                executable: pip3
-                extra_args: "-c {{ upper_constraints_file }}"
-              become: true
-
-            - name: get ARA callback plugin path
-              command: "python3 -m ara.setup.callback_plugins"
-              changed_when: false
-              register: ara_callback_plugins
-
-            - name: template ansible.cfg
-              template:
-                src: "{{ kolla_ansible_local_src_dir }}/tests/templates/ansible.cfg.j2"
-                dest: /etc/ansible/ansible.cfg
-              become: true
-
         - name: upgrade kolla-ansible
           pip:
             name: "{{ kolla_ansible_src_dir }}"

tests/templates/ceph-ansible-upgrade/cinder-backup.conf.j2

@@ -1,10 +0,0 @@
-{# 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

tests/templates/ceph-ansible-upgrade/cinder-volume.conf.j2

@@ -1,15 +0,0 @@
-{# 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 %}

tests/templates/ceph-ansible-upgrade/glance-api.conf.j2

@@ -1,8 +0,0 @@
-{# 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

tests/templates/inventory.j2

@@ -190,12 +190,6 @@ control
 [solum:children]
 control
 
-{# TODO(mnasiadka): Remove in Victoria #}
-{% if scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' %}
-[ceph:children]
-control
-{% endif %}
-
 [ironic:children]
 control
 
@@ -356,29 +350,6 @@ neutron
 [ironic-neutron-agent:children]
 neutron
 
-
-{# TODO(mnasiadka): Remove in Victoria #}
-{% if scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' %}
-# Ceph
-[ceph-mds:children]
-ceph
-
-[ceph-mgr:children]
-ceph
-
-[ceph-nfs:children]
-ceph
-
-[ceph-mon:children]
-ceph
-
-[ceph-rgw:children]
-ceph
-
-[ceph-osd:children]
-storage
-{% endif %}
-
 # Cinder
 [cinder-api:children]
 cinder

tests/templates/nova-compute-overrides.j2

@@ -7,12 +7,3 @@ cpu_model=max
 {% else %}
 cpu_mode=none
 {% endif %}
-
-{# 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 %}