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 `_. - 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