openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Add gating repo to update repos only if it's setup

Browse Source 
gating repo is setup only when packages get's build,
so add gating repo to update repos only when gating
repo is setup i.e based on compressed_gating_repo.

Also add new role variable container_prep_additional_repos,
which can be used to add more repos for container updates.

Closes-Bug: #1865459
Change-Id: I9e7b2e04182d156502c1fdb12bcb743d800a6b49
This commit is contained in:
yatinkarel 2020-03-06 19:45:29 +05:30 committed by yatin
parent 21a097e402
commit d70ee0de92
4 changed files with 16 additions and 4 deletions
roles
overcloud-prep-containers/defaults
main.yml
standalone/defaults
main.yml
undercloud-deploy/defaults
main.yml
undercloud-minion-deploy/defaults
main.yml

5
roles/overcloud-prep-containers/defaults/main.yml

@ -10,4 +10,7 @@ container_process_count: 8
use_overcloud_mixed_upgrade: false
prep_container_upgrade_run: false
gating_repo_name: gating-repo
update_containers_repo: "{{ gating_repo_name }},delorean-current"
container_prep_additional_repos: ""
update_containers_repo: >-
{% if compressed_gating_repo is defined %}{{ gating_repo_name }},{% endif %}delorean-current
{%- if container_prep_additional_repos -%},{{ container_prep_additional_repos }}{%- endif -%}

4
roles/standalone/defaults/main.yml

@ -17,8 +17,10 @@ standalone_container_prep_updates: >-
# Set the repo to update from
gating_repo_name: gating-repo
container_prep_additional_repos: ""
standalone_container_prep_update_repo: >-
{{ gating_repo_name }},delorean-current,quickstart-centos-ceph-nautilus
{% if compressed_gating_repo is defined %}{{ gating_repo_name }},{% endif %}delorean-current,quickstart-centos-ceph-nautilus
{%- if container_prep_additional_repos -%},{{ container_prep_additional_repos }}{%- endif -%}
# deploy script
standalone_deploy_script: standalone.sh.j2

6
roles/undercloud-deploy/defaults/main.yml

@ -78,7 +78,11 @@ ctlplane_masquerade: false
update_containers: false
gating_repo_name: gating-repo
update_containers_repo: "{{ gating_repo_name }},delorean-current"
container_prep_additional_repos: ""
update_containers_repo: >-
{% if compressed_gating_repo is defined %}{{ gating_repo_name }},{% endif %}delorean-current
{%- if container_prep_additional_repos -%},{{ container_prep_additional_repos }}{%- endif -%}
undercloud_enable_routed_networks: false
default_undercloud_roles_data_path: "{{ undercloud_templates_path }}/roles_data_undercloud.yaml"

5
roles/undercloud-minion-deploy/defaults/main.yml

@ -37,7 +37,10 @@ minion_network_environment_args: {}
update_containers: false
gating_repo_name: gating-repo
update_containers_repo: "{{ gating_repo_name }},delorean-current"
container_prep_additional_repos: ""
update_containers_repo: >-
{% if compressed_gating_repo is defined %}{{ gating_repo_name }},{% endif %}delorean-current
{%- if container_prep_additional_repos -%},{{ container_prep_additional_repos }}{%- endif -%}
default_minion_roles_data_path: "{{ minion_templates_path }}/roles_data_minion.yaml"