From 8270ae20f9a8d528d5bea9e275a84a3ef4cf23aa Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Fri, 28 Jun 2019 20:18:14 +0200 Subject: Extract CI vars for use in kolla-ansible jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If58f15e18e420aca790496132352f1c1dcdb2640 Signed-off-by: Radosław Piliszek --- tests/playbooks/run.yml | 11 ++--------- tests/vars/zuul.yml | 9 +++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 tests/vars/zuul.yml diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 671b7282c..d22a38870 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -1,14 +1,7 @@ --- - hosts: all - vars: - nodepool_rdo_proxy: "{{ zuul_site_mirror_fqdn }}:8080/rdo" - nodepool_pypi_mirror: "http://{{ zuul_site_mirror_fqdn }}:8080/pypi/simple" - nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}" - nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/" - nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/" - nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/" - nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos" - nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona" + vars_files: + - ../vars/zuul.yml tasks: - name: copy setup script copy: diff --git a/tests/vars/zuul.yml b/tests/vars/zuul.yml new file mode 100644 index 000000000..2465a3f79 --- /dev/null +++ b/tests/vars/zuul.yml @@ -0,0 +1,9 @@ +--- +nodepool_rdo_proxy: "{{ zuul_site_mirror_fqdn }}:8080/rdo" +nodepool_pypi_mirror: "http://{{ zuul_site_mirror_fqdn }}:8080/pypi/simple" +nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}" +nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/" +nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/" +nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/" +nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos" +nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona" -- cgit v1.2.3