Skip to content

Commit b76da23

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "Use Victoria RDO" into stable/victoria
2 parents 4dfdde4 + fa5b4b3 commit b76da23

File tree

4 files changed

+138
-6
lines changed

4 files changed

+138
-6
lines changed

‎docker/base/Dockerfile.j2‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,21 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
183183
{% set base_centos_yum_repo_keys = [
184184
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
185185
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
186+
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
186187
] %}
187188
# FIXME(mgoddard): Not available for CentOS 8 yet.
188189
#
189190
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
190191
#
191192

193+
# FIXME(mnasiadka): Remove adv virt, ceph, nfv-ovs and rabbitmq-38 repos
194+
# once centos-release-openstack-victoria package is out
192195
{% set base_centos_yum_repo_packages = [
193-
'centos-release-opstools',
196+
'centos-release-advanced-virtualization',
194197
'centos-release-ceph-nautilus',
198+
'centos-release-nfv-openvswitch',
199+
'centos-release-rabbitmq-38',
200+
'centos-release-opstools',
195201
'epel-release',
196202
] %}
197203

@@ -219,6 +225,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
219225
] %}
220226
{% endif %}
221227

228+
RUN curl -sSLf https://git.centos.org/rpms/centos-release-openstack/raw/c8-sig-cloud-openstack-victoria/f/SOURCES/RPM-GPG-KEY-CentOS-SIG-Cloud \
229+
-o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
230+
ADD rdo.repo /etc/yum.repos.d/CentOS-OpenStack-Victoria.repo
222231
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
223232

224233
{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}

‎docker/base/rdo.repo‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# CentOS-OpenStack-Victoria.repo
2+
#
3+
# Please see http://wiki.centos.org/SpecialInterestGroup/Cloud for more
4+
# information
5+
[centos-openstack-victoria]
6+
name=CentOS-$releasever - OpenStack Victoria
7+
#baseurl=http://mirror.centos.org/$contentdir/$releasever/cloud/$basearch/openstack-victoria/
8+
mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-victoria
9+
gpgcheck=1
10+
enabled=1
11+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
12+
exclude=sip,PyQt4
13+
module_hotfixes=1
14+
[centos-openstack-victoria-test]
15+
name=CentOS-$releasever - OpenStack Victoria Testing
16+
baseurl=https://buildlogs.centos.org/centos/$releasever/cloud/$basearch/openstack-victoria/
17+
gpgcheck=0
18+
enabled=0
19+
exclude=sip,PyQt4
20+
module_hotfixes=1
21+
[centos-openstack-victoria-debuginfo]
22+
name=CentOS-$releasever - OpenStack Victoria - Debug
23+
baseurl=http://debuginfo.centos.org/centos/$releasever/cloud/$basearch/
24+
gpgcheck=1
25+
enabled=0
26+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
27+
exclude=sip,PyQt4
28+
module_hotfixes=1
29+
[centos-openstack-victoria-source]
30+
name=CentOS-$releasever - OpenStack Victoria - Source
31+
baseurl=http://vault.centos.org/centos/$releasever/cloud/Source/openstack-victoria/
32+
gpgcheck=1
33+
enabled=0
34+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
35+
exclude=sip,PyQt4
36+
module_hotfixes=1
37+
[rdo-trunk-victoria-tested-component-baremetal]
38+
name=rdo-trunk-victoria-tested-component-baremetal
39+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/baremetal/current-tripleo-rdo
40+
enabled=0
41+
gpgcheck=0
42+
module_hotfixes=1
43+
[rdo-trunk-victoria-tested-component-cinder]
44+
name=rdo-trunk-victoria-tested-component-cinder
45+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/cinder/current-tripleo-rdo
46+
enabled=0
47+
gpgcheck=0
48+
module_hotfixes=1
49+
[rdo-trunk-victoria-tested-component-clients]
50+
name=rdo-trunk-victoria-tested-component-clients
51+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/clients/current-tripleo-rdo
52+
enabled=0
53+
gpgcheck=0
54+
module_hotfixes=1
55+
[rdo-trunk-victoria-tested-component-cloudops]
56+
name=rdo-trunk-victoria-tested-component-cloudops
57+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/cloudops/current-tripleo-rdo
58+
enabled=0
59+
gpgcheck=0
60+
module_hotfixes=1
61+
[rdo-trunk-victoria-tested-component-common]
62+
name=rdo-trunk-victoria-tested-component-common
63+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/common/current-tripleo-rdo
64+
enabled=0
65+
gpgcheck=0
66+
module_hotfixes=1
67+
[rdo-trunk-victoria-tested-component-compute]
68+
name=rdo-trunk-victoria-tested-component-compute
69+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/compute/current-tripleo-rdo
70+
enabled=0
71+
gpgcheck=0
72+
module_hotfixes=1
73+
[rdo-trunk-victoria-tested-component-glance]
74+
name=rdo-trunk-victoria-tested-component-glance
75+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/glance/current-tripleo-rdo
76+
enabled=0
77+
gpgcheck=0
78+
module_hotfixes=1
79+
[rdo-trunk-victoria-tested-component-manila]
80+
name=rdo-trunk-victoria-tested-component-manila
81+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/manila/current-tripleo-rdo
82+
enabled=0
83+
gpgcheck=0
84+
module_hotfixes=1
85+
[rdo-trunk-victoria-tested-component-network]
86+
name=rdo-trunk-victoria-tested-component-network
87+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/network/current-tripleo-rdo
88+
enabled=0
89+
gpgcheck=0
90+
module_hotfixes=1
91+
[rdo-trunk-victoria-tested-component-octavia]
92+
name=rdo-trunk-victoria-tested-component-octavia
93+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/octavia/current-tripleo-rdo
94+
enabled=0
95+
gpgcheck=0
96+
module_hotfixes=1
97+
[rdo-trunk-victoria-tested-component-security]
98+
name=rdo-trunk-victoria-tested-component-security
99+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/security/current-tripleo-rdo
100+
enabled=0
101+
gpgcheck=0
102+
module_hotfixes=1
103+
[rdo-trunk-victoria-tested-component-swift]
104+
name=rdo-trunk-victoria-tested-component-swift
105+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/swift/current-tripleo-rdo
106+
enabled=0
107+
gpgcheck=0
108+
module_hotfixes=1
109+
[rdo-trunk-victoria-tested-component-tempest]
110+
name=rdo-trunk-victoria-tested-component-tempest
111+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/tempest/current-tripleo-rdo
112+
enabled=0
113+
gpgcheck=0
114+
module_hotfixes=1
115+
[rdo-trunk-victoria-tested-component-tripleo]
116+
name=rdo-trunk-victoria-tested-component-tripleo
117+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/tripleo/current-tripleo-rdo
118+
enabled=0
119+
gpgcheck=0
120+
module_hotfixes=1
121+
[rdo-trunk-victoria-tested-component-ui]
122+
name=rdo-trunk-victoria-tested-component-ui
123+
baseurl=https://trunk.rdoproject.org/centos8-victoria/component/ui/current-tripleo-rdo
124+
enabled=0
125+
gpgcheck=0
126+
module_hotfixes=1
127+

‎kolla/common/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
help=('Set the package type of the distro. If not set then '
272272
'the packaging type is set to "rpm" if a RHEL based '
273273
'distro and "deb" if a Debian based distro.')),
274-
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
274+
cfg.ListOpt('rpm_setup_config', default=[],
275275
help=('Comma separated list of .rpm or .repo file(s) '
276276
'or URL(s) to install before building containers')),
277277
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),

‎tests/templates/template_overrides.j2‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ RUN sed -i \
3939
{% block base_centos_repo_overrides_post_rpm %}
4040
{% endraw %}
4141

42-
RUN sed -i \
43-
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
44-
/etc/yum.repos.d/delorean*.repo
45-
4642
{% raw %}
4743
{% endblock %}
4844

0 commit comments

Comments
 (0)