From 62ab17f696248a20f8956a5213b67df96a617b06 Mon Sep 17 00:00:00 2001
From: Jake Yip <jake.yip@unimelb.edu.au>
Date: Fri, 26 Apr 2019 21:10:35 +1000
Subject: [PATCH] Use rocky heat-container-agent for stable/rocky

stable/rocky branch should use rocky-stable container - protect against
changes from stein-dev.

Change-Id: I08d6606a5c4138866b1c0250b5ea2bc539b06e26
---
 doc/source/user/index.rst                                     | 4 ++--
 .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml   | 2 +-
 .../notes/heat-container-agent-tag-92848c1062c16c76.yaml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 0659ac7fc9..822a7426df 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -1115,7 +1115,7 @@ _`cloud_provider_tag`
   <https://github.com/kubernetes/cloud-provider-openstack/releases>`_ of
   the cloud-provider. The images are hosted `here
   <https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/>`_.
-  Stein default: v0.2.0
+  Rocky default: v0.2.0
 
 _`etcd_tag`
   This label allows users to select `a specific etcd version,
@@ -1135,7 +1135,7 @@ _`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/>`_.
-  Stein-default: stein-dev
+  Rocky default: rocky-stable
 
 _`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 5033743f89..e4ea9ba2ec 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -520,7 +520,7 @@ parameters:
   heat_container_agent_tag:
     type: string
     description: tag of the heat_container_agent system container
-    default: stein-dev
+    default: rocky-stable
 
   keystone_auth_enabled:
     type: boolean
diff --git a/releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml b/releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml
index 5d96468da7..28ec89708c 100644
--- a/releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml
+++ b/releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml
@@ -2,4 +2,4 @@
 features:
   - |
     Add heat_container_agent_tag label to allow users select the heat-agent
-    tag. Stein default: stein-dev
+    tag. Rocky default: rocky-stable