From 6f876254570196ccfdf5eeb0bcd16e9f56d53a13 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 14 Nov 2019 11:57:17 +0000
Subject: [PATCH] CI: Remove Stein upgrade support from CI

Resolves a number of TODOs in the CI configuration that provide support
for upgrading from the Stein release.

Change-Id: I9bac5c230b82ac7c097fe6ca2556e428abda31a1
Depends-On: https://review.opendev.org/694254
---
 tests/run.yml                      |  6 ------
 tests/templates/globals-default.j2 |  3 ---
 tests/templates/inventory.j2       | 12 ------------
 3 files changed, 21 deletions(-)

diff --git a/tests/run.yml b/tests/run.yml
index 581edfe196..36761e4eea 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -91,12 +91,6 @@
       vars:
         is_previous_release: "{{ is_upgrade }}"
       with_items:
-        # Docker daemon.json
-        # TODO(mgoddard): Remove templating of docker daemon.json in Ussuri cycle.
-        - src: "tests/templates/docker_daemon.json.j2"
-          dest: "/etc/docker/daemon.json"
-          become: true
-          when: "{{ is_previous_release and previous_release == 'stein' }}"
         # Ansible inventory
         - src: "tests/templates/inventory.j2"
           dest: "{{ kolla_inventory_path }}"
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index b0f5718fda..24e3f79a56 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -4,13 +4,10 @@ kolla_install_type: "{{ install_type }}"
 network_interface: "{{ api_interface_name }}"
 network_address_family: "{{ address_family }}"
 docker_restart_policy: "no"
-# TODO(mgoddard): Always do this in Ussuri cycle.
-{% if not is_previous_release or previous_release != 'stein' %}
 docker_custom_config:
   debug: true
   registry-mirrors:
     - {{ infra_dockerhub_mirror }}
-{% endif %}
 
 # Use a random router id, otherwise it may result in the same router id
 # in the CI gate.
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index 07f9f1d5d5..71da73b3ca 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -281,12 +281,6 @@ nova
 [nova-super-conductor:children]
 nova
 
-# TODO(yoctozepto): Remove completely in the Ussuri cycle.
-{% if is_previous_release and previous_release == 'stein' %}
-[nova-consoleauth:children]
-nova
-{% endif %}
-
 [nova-novncproxy:children]
 nova
 
@@ -312,12 +306,6 @@ neutron
 [neutron-l3-agent:children]
 neutron
 
-# TODO(yoctozepto): Remove completely in the Ussuri cycle.
-{% if is_previous_release and previous_release == 'stein' %}
-[neutron-lbaas-agent:children]
-neutron
-{% endif %}
-
 [neutron-metadata-agent:children]
 neutron