From 81d0699c4c85a1b8c7f1a8a8c0911b2c0cb2f048 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Wed, 3 Jun 2020 08:34:41 +0000
Subject: [PATCH] [hca] Pin fedora to 32 until new greenlet release

Eventlet used by many openstack packages depends on greenlet which does
not have a pip release supported by Python 3.9 (default Python version
on Fedora 33). Therefore, pin Fedora to version 32 until new greenlet
release is cut which includes the required fix [0].

Also update default heat_container_agent_tag to victoria-dev.

[0] https://github.com/python-greenlet/greenlet/pull/161

Change-Id: Ice75ae880925cd15c096eb6d1cdabf7f802bccde
Story: 2007264
Task: 39941
---
 doc/source/user/index.rst                                     | 4 +++-
 dockerfiles/heat-container-agent/Dockerfile                   | 2 +-
 .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml   | 2 +-
 .../drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml   | 2 +-
 playbooks/container-builder-vars.yaml                         | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 98708ad297..2d3c475c84 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -1336,7 +1336,9 @@ _`heat_container_agent_tag`
   This label allows users to select `a specific heat_container_agent
   version, based on its container tag
   <https://hub.docker.com/r/openstackmagnum/heat-container-agent/tags/>`_.
-  Train-default: train-dev
+  Train-default: ussuri-dev
+  Ussuri-default: ussuri-dev
+  Victoria-default: victoria-dev
 
 _`kube_dashboard_enabled`
   This label triggers the deployment of the kubernetes dashboard.
diff --git a/dockerfiles/heat-container-agent/Dockerfile b/dockerfiles/heat-container-agent/Dockerfile
index 11d7f71b19..7d97ff9274 100644
--- a/dockerfiles/heat-container-agent/Dockerfile
+++ b/dockerfiles/heat-container-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:rawhide
+FROM fedora:32
 
 ARG ARCH=x86_64
 
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
index 77ad3f905f..7bc19623cc 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -670,7 +670,7 @@ parameters:
   heat_container_agent_tag:
     type: string
     description: tag of the heat_container_agent system container
-    default: ussuri-dev
+    default: victoria-dev
 
   keystone_auth_enabled:
     type: boolean
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
index b7faca15f0..9f4765d8c6 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
@@ -678,7 +678,7 @@ parameters:
   heat_container_agent_tag:
     type: string
     description: tag of the heat_container_agent system container
-    default: ussuri-dev
+    default: victoria-dev
 
   keystone_auth_enabled:
     type: boolean
diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index aec668a36b..cbada02b8c 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/playbooks/container-builder-vars.yaml
@@ -4,7 +4,7 @@ magnum_repository: openstackmagnum
 
 magnum_images:
   - name: heat-container-agent
-    tag: ussuri-dev
+    tag: victoria-dev
 
 kubernetes_versions:
   - version: v1.15.12