openstack/kolla
Code Issues Proposed changes

Use infra mirrors for ODL and percona repos

Browse Source 
Change-Id: I212a53b235f2785d93d474660c87a8521f3cc8b2
This commit is contained in:
Eduardo Gonzalez 2018-12-17 19:46:48 +01:00
parent b4dd65ba1c
commit 0c4238da7c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/percona-release.repo
View File

@ -1,13 +1,13 @@
[percona-release-$basearch] [percona-release-$basearch]
name = Percona-Release YUM repository - $basearch name = Percona-Release YUM repository - $basearch
baseurl = http://repo.percona.com/release/$releasever/RPMS/$basearch baseurl = https://repo.percona.com/release/$releasever/RPMS/$basearch
enabled = 0 enabled = 0
gpgcheck = 1 gpgcheck = 1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona
[percona-release-noarch] [percona-release-noarch]
name = Percona-Release YUM repository - noarch name = Percona-Release YUM repository - noarch
baseurl = http://repo.percona.com/release/$releasever/RPMS/noarch baseurl = https://repo.percona.com/release/$releasever/RPMS/noarch
enabled = 0 enabled = 0
gpgcheck = 1 gpgcheck = 1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Percona

3
tests/playbooks/run.yml
View File

@ -8,8 +8,9 @@
nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/" nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/"
nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/" nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/"
nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/" nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/"
nodepool_opendaylight_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/opendaylight/" nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos"
nodepool_oraclelinux_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/oraclelinux/" nodepool_oraclelinux_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/oraclelinux/"
nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona"
tasks: tasks:
- name: generate kolla inventory file - name: generate kolla inventory file
copy: copy:

3
tests/templates/kolla-build.conf.j2
View File

@ -7,6 +7,3 @@ tag = {{ zuul.tag if zuul.pipeline == "release" else zuul.branch | basename }}
push = false push = false
logs_dir = /tmp/logs/build logs_dir = /tmp/logs/build
template_override = /etc/kolla/template_overrides.j2 template_override = /etc/kolla/template_overrides.j2
[opendaylight]
location = {{ nodepool_opendaylight_proxy}}/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz

4
tests/templates/template_overrides.j2
View File

@ -44,6 +44,8 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
-e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
-e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \
-e "s|^baseurl=https://cbs.centos.org/repos|baseurl={{ nodepool_cbs_centos_proxy }}|g" \
-e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \
/etc/yum.repos.d/*.repo /etc/yum.repos.d/*.repo
{% raw %} {% raw %}
@ -58,6 +60,8 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
-e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
-e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \
-e "s|^baseurl=https://cbs.centos.org/repos|baseurl={{ nodepool_cbs_centos_proxy }}|g" \
-e "s|^baseurl=https://repo.percona.com|baseurl={{ nodepool_percona_proxy }}|g" \
/etc/yum.repos.d/*.repo /etc/yum.repos.d/*.repo
{% raw %} {% raw %}