aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2019-06-28 20:18:14 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2019-06-28 20:18:14 +0200
commit8270ae20f9a8d528d5bea9e275a84a3ef4cf23aa (patch)
tree7decc57960c3584aa81fc3a9efa09220e42f71da
parent5ecb9107ea286bd0c1a45d4d95d064c764d33296 (diff)
downloadkolla-8270ae20f9a8d528d5bea9e275a84a3ef4cf23aa.tar.gz
kolla-8270ae20f9a8d528d5bea9e275a84a3ef4cf23aa.zip
Extract CI vars for use in kolla-ansible jobs
Change-Id: If58f15e18e420aca790496132352f1c1dcdb2640 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
-rw-r--r--tests/playbooks/run.yml11
-rw-r--r--tests/vars/zuul.yml9
2 files changed, 11 insertions, 9 deletions
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"