Merge "Allow to override kolla-build rpm config"

roles/build-containers/defaults/main.yaml

@@ -2,3 +2,4 @@ push_registry: "127.0.0.1:8787"
 push_containers: "false"
 use_buildah: false
 buildcontainers_override_repos: ""
+buildcontainers_rpm_setup_config: "http://172.17.0.1/delorean.repo,http://172.17.0.1/delorean-{{ ci_branch }}-testing.repo"

roles/build-containers/tasks/pre.yaml

@@ -1,15 +1,4 @@
 ---
-- name: set tripleo repos
-  include_role:
-    name: tripleo-repos
-  vars:
-    override_repos: "{{ buildcontainers_override_repos | default('') }}"
-    tripleo_repos_repository: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/tripleo-repos'].src_dir }}"
-- name: install deps via bindep
-  include_role:
-    name: bindep
-  vars:
-    bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/python-tripleoclient'].src_dir }}"
 - name: Include common vars
   include_vars:
     dir: "vars"

roles/build-containers/templates/kolla-build.conf.j2

@@ -5,7 +5,7 @@ registry={{ push_registry }}
 tag={{ version_hash }}
 template_override={{ openstack_git_root }}/tripleo-common/container-images/tripleo_kolla_template_overrides.j2
 # we use the repos off the main host as they will already have the correct mirror info in them
-rpm_setup_config=http://172.17.0.1/delorean.repo,http://172.17.0.1/delorean-{{ ci_branch }}-testing.repo
+rpm_setup_config="{{ buildcontainers_rpm_setup_config }}"
 push={{ push_containers }}
 namespace=tripleo{{ ci_branch }}
 debug=True