[hca] Use wallaby-stable-1 as default HCA tag
Additionally: - update syntax for compatibility with Ansible 2.9+. - explicitly check for "not found" to prevent rebuild due to other types of errors, e.g. "pull rate limit". Story: 2007264 Task: 42009 Change-Id: I68ca057e500ea293bde398288432a67eb758af25
This commit is contained in:
parent
3f40b9a1b7
commit
7be7a5a123
@ -1346,9 +1346,10 @@ _`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: ussuri-dev
|
||||
Ussuri-default: ussuri-dev
|
||||
Victoria-default: victoria-dev
|
||||
Train-default: train-stable-3
|
||||
Ussuri-default: ussuri-stable-1
|
||||
Victoria-default: victoria-stable-1
|
||||
Wallaby-default: wallaby-stable-1
|
||||
|
||||
_`kube_dashboard_enabled`
|
||||
This label triggers the deployment of the kubernetes dashboard.
|
||||
|
@ -670,7 +670,7 @@ parameters:
|
||||
heat_container_agent_tag:
|
||||
type: string
|
||||
description: tag of the heat_container_agent system container
|
||||
default: victoria-dev
|
||||
default: wallaby-stable-1
|
||||
|
||||
keystone_auth_enabled:
|
||||
type: boolean
|
||||
|
@ -678,7 +678,7 @@ parameters:
|
||||
heat_container_agent_tag:
|
||||
type: string
|
||||
description: tag of the heat_container_agent system container
|
||||
default: victoria-dev
|
||||
default: wallaby-stable-1
|
||||
|
||||
keystone_auth_enabled:
|
||||
type: boolean
|
||||
|
@ -7,8 +7,7 @@ magnum_repository: openstackmagnum
|
||||
# image is re-built and pushed under the same tag every time.
|
||||
heat_container_agent_images:
|
||||
- tag: victoria-stable-1
|
||||
- tag: wallaby-dev
|
||||
dev: true
|
||||
- tag: wallaby-stable-1
|
||||
|
||||
kubernetes_versions:
|
||||
- version: v1.15.12
|
||||
|
@ -11,32 +11,35 @@
|
||||
docker_image:
|
||||
name: "{{ magnum_repository }}/heat-container-agent"
|
||||
tag: "{{ item.tag }}"
|
||||
pull: yes
|
||||
source: pull
|
||||
register: docker_output
|
||||
when: not (item.dev | default(false) | bool)
|
||||
ignore_errors: true
|
||||
failed_when: (docker_output is failed and "pull rate limit" in docker_output.msg)
|
||||
with_items: "{{ heat_container_agent_images }}"
|
||||
- name: "Build {{ magnum_repository }}/heat-container-agent:{{ item.item.tag }} image"
|
||||
docker_image:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/heat-container-agent"
|
||||
build:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/heat-container-agent"
|
||||
name: "{{ magnum_repository }}/heat-container-agent"
|
||||
tag: "{{ item.item.tag }}"
|
||||
push: no
|
||||
source: build
|
||||
with_items: "{{ docker_output.results }}"
|
||||
when: (item is failed) or (item.item.dev | default(false) | bool)
|
||||
when: ("msg" in item and "not found" in item.msg) or (item.item.dev | default(false) | bool)
|
||||
retries: 10
|
||||
|
||||
- name: "Build kubernetes images"
|
||||
block:
|
||||
- name: "Build {{ magnum_repository }}/{{ item[1].name }}:{{ item[0].version }} image"
|
||||
docker_image:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/{{ item[1].name }}"
|
||||
name: "{{ magnum_repository }}/{{ item[1].name }}"
|
||||
tag: "{{ item[0].version }}"
|
||||
buildargs:
|
||||
KUBE_VERSION: "{{ item[0].version }}"
|
||||
build:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/{{ item[1].name }}"
|
||||
args:
|
||||
KUBE_VERSION: "{{ item[0].version }}"
|
||||
push: no
|
||||
source: build
|
||||
with_nested:
|
||||
- "{{ kubernetes_versions }}"
|
||||
- "{{ kubernetes_images }}"
|
||||
@ -45,12 +48,14 @@
|
||||
- name: "Build helm-client image"
|
||||
block:
|
||||
- docker_image:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/helm-client"
|
||||
name: "{{ magnum_repository }}/helm-client"
|
||||
tag: "{{ item.version }}"
|
||||
buildargs:
|
||||
HELM_VERSION: "{{ item.version }}"
|
||||
build:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/helm-client"
|
||||
args:
|
||||
HELM_VERSION: "{{ item.version }}"
|
||||
push: no
|
||||
source: build
|
||||
with_items: "{{ helm_versions }}"
|
||||
retries: 10
|
||||
|
||||
@ -58,11 +63,13 @@
|
||||
block:
|
||||
- name: "Build {{ magnum_repository }}/cluster-autoscaler:v{{ item.version }}"
|
||||
docker_image:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/cluster-autoscaler"
|
||||
name: "{{ magnum_repository }}/cluster-autoscaler"
|
||||
tag: "v{{ item.version }}"
|
||||
buildargs:
|
||||
AUTOSCALER_VERSION: "cluster-autoscaler-{{ item.version }}"
|
||||
build:
|
||||
path: "{{ magnum_src_dir }}/dockerfiles/cluster-autoscaler"
|
||||
args:
|
||||
AUTOSCALER_VERSION: "cluster-autoscaler-{{ item.version }}"
|
||||
push: no
|
||||
source: build
|
||||
with_items: "{{ cluster_autoscaler_versions }}"
|
||||
retries: 10
|
||||
|
Loading…
Reference in New Issue
Block a user