diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-05 11:00:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-05 11:00:14 +0000 |
| commit | 00475feb7f62c192b6ff5f12bff1b77efd85da6f (patch) | |
| tree | 3cc7721b0a2d4b2947e2f7bc66f29e2c09b78e23 /docker/base | |
| parent | 4e083196d14877de458ae16129331c37fe1f6f21 (diff) | |
| parent | e0cae62c4aab001fa7b5cc324f178793f4e88f3c (diff) | |
| download | kolla-00475feb7f62c192b6ff5f12bff1b77efd85da6f.tar.gz kolla-00475feb7f62c192b6ff5f12bff1b77efd85da6f.zip | |
Merge "Ceph: Update to Nautilus on CentOS and OracleLinux"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/base/ceph.repo | 21 |
2 files changed, 26 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index afa53fbd5..38372f72d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -79,11 +79,11 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY {% if base_arch == 'x86_64' %} {% set base_yum_repo_files = [ + 'ceph.repo', 'crane.repo', 'elasticsearch.repo', 'grafana.repo', 'influxdb.repo', - 'nfs_ganesha.repo', 'opendaylight.repo', 'percona-release.repo', 'rabbitmq_rabbitmq-server.repo', @@ -99,6 +99,10 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY '/etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY', 'https://packages.treasuredata.com/GPG-KEY-td-agent' ] %} +{% elif base_arch == 'aarch64' %} + {% set base_yum_repo_files = [ + 'ceph.repo', + ] %} {% endif %} {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %} @@ -140,12 +144,10 @@ 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-OpsTools', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-ceph-luminous', 'centos-release-opstools', 'centos-release-qemu-ev', 'epel-release', @@ -189,7 +191,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' ], chain=True, clean=False) }} \ && rpm -Uvh --nodeps \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-luminous-1.1-2.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-8.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ diff --git a/docker/base/ceph.repo b/docker/base/ceph.repo new file mode 100644 index 000000000..ebe8486e3 --- /dev/null +++ b/docker/base/ceph.repo @@ -0,0 +1,21 @@ +[ceph] +name=ceph +baseurl=https://download.ceph.com/rpm-nautilus/el7/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://download.ceph.com/keys/release.asc + +[ceph-noarch] +name=Ceph noarch packages +baseurl=https://download.ceph.com/rpm-nautilus/el7/noarch +enabled=1 +priority=2 +gpgcheck=1 +gpgkey=https://download.ceph.com/keys/release.asc + +[nfs_ganesha] +baseurl = http://download.ceph.com/nfs-ganesha/rpm-V2.7-stable/nautilus/$basearch +gpgcheck = 1 +gpgkey = https://download.ceph.com/keys/release.asc +name = nfs-ganesha stable repo +skip_if_unavailable = 1 |