diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-03 07:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-03 07:37:56 +0000 |
| commit | 9a3a9d06c2a4b13a134f9ac2eec843e7b4e3dde4 (patch) | |
| tree | 253fd6a2637fcfe45ba22902bda264a461a17883 | |
| parent | 02f3f09143e652526fac7d6aae9aab5b9a272505 (diff) | |
| parent | 8270ae20f9a8d528d5bea9e275a84a3ef4cf23aa (diff) | |
| download | kolla-9a3a9d06c2a4b13a134f9ac2eec843e7b4e3dde4.tar.gz kolla-9a3a9d06c2a4b13a134f9ac2eec843e7b4e3dde4.zip | |
Merge "Extract CI vars for use in kolla-ansible jobs"
| -rw-r--r-- | tests/playbooks/run.yml | 11 | ||||
| -rw-r--r-- | tests/vars/zuul.yml | 9 |
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" |