Browse Source

Merge "[hca] Use ussuri-stable-1 as default for stable/ussuri" into stable/ussuri

changes/50/735150/3
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
0193aa38f7
3 changed files with 4 additions and 3 deletions
  1. +2
    -1
      doc/source/user/index.rst
  2. +1
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  3. +1
    -1
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

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

@@ -1338,7 +1338,8 @@ _`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/>`_.
Train-default: train-dev
Train-default: train-stable-3
Ussuri-default: ussuri-stable-1

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

@@ -670,7 +670,7 @@ parameters:
heat_container_agent_tag:
type: string
description: tag of the heat_container_agent system container
default: ussuri-dev
default: ussuri-stable-1

keystone_auth_enabled:
type: boolean


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

@@ -678,7 +678,7 @@ parameters:
heat_container_agent_tag:
type: string
description: tag of the heat_container_agent system container
default: ussuri-dev
default: ussuri-stable-1

keystone_auth_enabled:
type: boolean


Loading…
Cancel
Save