Merge "standalone: Remove logic for unsupported old releases"

roles/standalone-upgrade/tasks/main.yml

@@ -26,7 +26,7 @@
 
 - name: Check whether control plane defaults to HA
   set_fact:
-    standalone_upgrade_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'stein', 'train'] }}"
+    standalone_upgrade_ha_control_plane: "{{ release not in ['train'] }}"
 
 - name: Create the upgrade command for standalone
   template:

roles/standalone-upgrade/templates/standalone.sh.j2

@@ -16,7 +16,7 @@ sudo openstack tripleo upgrade $PROMPT_ANSWER \
 {% if standalone_custom_env_files %}
   -e {{ standalone_custom_env_files | join(' -e ') }} \
 {% endif %}
-{% if release in ['stein', 'train', 'ussuri'] %}
+{% if release in ['train'] %}
   --standalone \
 {% endif %}
   --output-dir {{ working_dir }}/tripleo-deploy

roles/standalone/tasks/containers.yml

@@ -67,7 +67,7 @@
 
 - name: Run container prepare legacy
   when:
-    - release in ['queens', 'stein', 'train']
+    - release in ['train']
   block:
 
     - name: Create container parameters script
@@ -84,7 +84,7 @@
 
 - name: Run container prepare via tripleo-operator-ansible
   when:
-    - release not in ['queens', 'stein', 'train']
+    - release not in ['train']
   collections:
     - tripleo.operator
   include_role:
@@ -238,11 +238,7 @@
           {%   set _ = item.__setitem__("push_destination", local_docker_registry_host ~ ":8787") %}
           {%   set _ = item.__setitem__("modify_role", "tripleo-modify-image") %}
           {%   set _ = item.__setitem__("modify_append_tag", update_containers_append_tag) %}
-          {%   if release in ['stein'] %}
-          {%     set _ = item.__setitem__("modify_only_with_labels", ["kolla_version"]) %}
-          {%   else %}
-          {%     set _ = item.__setitem__("modify_only_with_source", ["kolla", "tripleo"]) %}
-          {%   endif %}
+          {%   set _ = item.__setitem__("modify_only_with_source", ["kolla", "tripleo"]) %}
           {%   set _ = item.__setitem__(
                 "modify_vars",
                 {
@@ -283,7 +279,6 @@
     - standalone_container_prep_updates
     - ansible_distribution == 'RedHat'
     - ansible_distribution_major_version|int >= 8
-    - release not in ['newton', 'ocata', 'pike', 'queens']
   replace:
     path: "{{ working_dir }}/standalone_parameters.yaml"
     regexp: " - 192.168.24.1:8787"

roles/standalone/tasks/main.yml

@@ -3,5 +3,5 @@
 - include_tasks: ceph-install.yml
   when:
     - job.standalone_ceph | default(false)
-    - release not in ['train', 'victoria']
+    - release not in ['train']
 - include_tasks: standalone-install.yml

roles/standalone/tasks/standalone-install.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check whether control plane defaults to HA
   set_fact:
-    tripleo_deploy_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'stein', 'train'] }}"
+    tripleo_deploy_ha_control_plane: "{{ release not in ['train'] }}"
 
 - name: Run standalone via tripleo-operator-ansible
   collections:
@@ -10,7 +10,7 @@
     name: tripleo_deploy
   vars:
     tripleo_deploy_debug: true
-    tripleo_deploy_reproducer_command: "{{ release not in ['wallaby', 'victoria', 'ussuri', 'train', 'stein'] }}"
+    tripleo_deploy_reproducer_command: "{{ release not in ['wallaby', 'train'] }}"
     tripleo_deploy_debug_arg: "{{ standalone_tripleo_deploy_debug_arg }}"
     tripleo_deploy_local_ip: "{{ standalone_ip }}/{{ standalone_network_prefix }}"
     tripleo_deploy_control_virtual_ip: >-
@@ -38,7 +38,7 @@
       {% endif %}
       {{ env_files }}
     # NOTE(mwhahaha): option no longer required as of V.
-    tripleo_deploy_standalone: "{{ release in ['stein', 'train', 'ussuri'] }}"
+    tripleo_deploy_standalone: "{{ release in ['train'] }}"
 
 - when: standalone_ansible_lint|default(false)|bool
   vars: