Merge "Use rocky heat-container-agent for stable/rocky" into stable/rocky
This commit is contained in:
commit
d2d9645d6d
|
@ -1115,7 +1115,7 @@ _`cloud_provider_tag`
|
||||||
<https://github.com/kubernetes/cloud-provider-openstack/releases>`_ of
|
<https://github.com/kubernetes/cloud-provider-openstack/releases>`_ of
|
||||||
the cloud-provider. The images are hosted `here
|
the cloud-provider. The images are hosted `here
|
||||||
<https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/>`_.
|
<https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/>`_.
|
||||||
Stein default: v0.2.0
|
Rocky default: v0.2.0
|
||||||
|
|
||||||
_`etcd_tag`
|
_`etcd_tag`
|
||||||
This label allows users to select `a specific etcd version,
|
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
|
This label allows users to select `a specific heat_container_agent
|
||||||
version, based on its container tag
|
version, based on its container tag
|
||||||
<https://hub.docker.com/r/openstackmagnum/heat-container-agent/tags/>`_.
|
<https://hub.docker.com/r/openstackmagnum/heat-container-agent/tags/>`_.
|
||||||
Stein-default: stein-dev
|
Rocky default: rocky-stable
|
||||||
|
|
||||||
_`kube_dashboard_enabled`
|
_`kube_dashboard_enabled`
|
||||||
This label triggers the deployment of the kubernetes dashboard.
|
This label triggers the deployment of the kubernetes dashboard.
|
||||||
|
|
|
@ -520,7 +520,7 @@ parameters:
|
||||||
heat_container_agent_tag:
|
heat_container_agent_tag:
|
||||||
type: string
|
type: string
|
||||||
description: tag of the heat_container_agent system container
|
description: tag of the heat_container_agent system container
|
||||||
default: stein-dev
|
default: rocky-stable
|
||||||
|
|
||||||
keystone_auth_enabled:
|
keystone_auth_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
features:
|
features:
|
||||||
- |
|
- |
|
||||||
Add heat_container_agent_tag label to allow users select the heat-agent
|
Add heat_container_agent_tag label to allow users select the heat-agent
|
||||||
tag. Stein default: stein-dev
|
tag. Rocky default: rocky-stable
|
||||||
|
|
Loading…
Reference in New Issue