From c6bf1da085383795d4f412c6af78693ee395badf Mon Sep 17 00:00:00 2001 From: Feilong Wang Date: Fri, 26 Jul 2019 10:01:19 +1200 Subject: [PATCH] Set train-dev as the default tag for heat-container-agent Based on the policy of heat-container-agent tag, now it's updated as train-dev and as long as we release Train, it will be updated with train-stable. Change-Id: Iec43df292dbd6a7e7ee33a0d4b8670b653a7ebbd --- doc/source/user/index.rst | 2 +- .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- playbooks/container-builder-vars.yaml | 2 +- .../heat-container-agent-for-train-e63bc1559750fe9c.yaml | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index ad40060fc8..b534a2f9bf 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -1209,7 +1209,7 @@ _`heat_container_agent_tag` This label allows users to select `a specific heat_container_agent version, based on its container tag `_. - Stein-default: stein-dev + Train-default: train-dev _`kube_dashboard_enabled` This label triggers the deployment of the kubernetes dashboard. diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 4082c1a305..7d98b8bbff 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -554,7 +554,7 @@ parameters: heat_container_agent_tag: type: string description: tag of the heat_container_agent system container - default: stein-dev + default: train-dev keystone_auth_enabled: type: boolean diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml index 2582636aca..5ac0b8f715 100644 --- a/playbooks/container-builder-vars.yaml +++ b/playbooks/container-builder-vars.yaml @@ -15,6 +15,6 @@ kubernetes_images: magnum_images: - name: heat-container-agent - tag: stein-dev + tag: train-dev helm_version: v2.12.3 diff --git a/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml b/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml new file mode 100644 index 0000000000..d6467ea361 --- /dev/null +++ b/releasenotes/notes/heat-container-agent-for-train-e63bc1559750fe9c.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + Now the heat-container-agent default tag for Train release is train-dev.