From aeb86de6fc644a514d060b4ac869cab364266f03 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 7 Oct 2016 01:26:24 -0400
Subject: [PATCH] Move RDO to Newton branches
RDO Newton is available. Lets use it and test with it this final week.
TrivialFix
Change-Id: I2a761366da7c2cf209adaceb73ac7fa9c9aa3cba
---
docker/base/Dockerfile.j2 | 5 ++++-
kolla/common/config.py | 2 +-
kolla/image/build.py | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 34133d104d..6c06d6d8b1 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -80,6 +80,7 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% set base_centos_yum_repo_keys = [
+ '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
] %}
@@ -88,6 +89,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
'epel-release ',
'yum-plugin-priorities',
'centos-release-ceph-jewel',
+ 'centos-release-openstack-newton',
'centos-release-qemu-ev'
] %}
@@ -123,13 +125,14 @@ RUN yum -y install \
yum-utils \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \
&& rpm -Uvh --nodeps \
- http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \
+ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-openstack-newton-1-1.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \
&& sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
+ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \
&& yum-config-manager --enable ol7_optional_latest ol7_addons \
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 94b4cc1c87..d00d265e2b 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -144,7 +144,7 @@ _BASE_OPTS = [
cfg.StrOpt('maintainer',
default='Kolla Project (https://launchpad.net/kolla)',
help='The MAINTAINER field'),
- cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
+ cfg.ListOpt('rpm_setup_config',
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),
diff --git a/kolla/image/build.py b/kolla/image/build.py
index d0d36a457a..59f4f3ced8 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -514,7 +514,10 @@ class KollaWorker(object):
self.install_type = conf.install_type
self.tag = conf.tag
self.images = list()
- rpm_setup_config = filter(None, conf.rpm_setup_config)
+ if conf.rpm_setup_config:
+ rpm_setup_config = filter(None, conf.rpm_setup_config)
+ else:
+ rpm_setup_config = list()
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel']