Browse Source

Merge "Use rocky heat-container-agent for stable/rocky" into stable/rocky

tags/7.2.0
Zuul 1 year ago
committed by Gerrit Code Review
parent
commit
d2d9645d6d
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      doc/source/user/index.rst
  2. +1
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  3. +1
    -1
      releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml

+ 2
- 2
doc/source/user/index.rst View File

@@ -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.


+ 1
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

@@ -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


+ 1
- 1
releasenotes/notes/heat-container-agent-tag-92848c1062c16c76.yaml View File

@@ -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

Loading…
Cancel
Save