diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-21 16:15:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-21 16:15:48 +0000 |
| commit | 32e02a2fb88b9da620c61c3804802a16780ce9ff (patch) | |
| tree | 44db44d9aaff760e577e5dc496da6dc80bb01cbb /docker/base | |
| parent | 13a3746ffcab9ba53eff47003db983e98664f64f (diff) | |
| parent | 31c958db5200ef900b7259da8efc9536ced63197 (diff) | |
| download | kolla-32e02a2fb88b9da620c61c3804802a16780ce9ff.tar.gz kolla-32e02a2fb88b9da620c61c3804802a16780ce9ff.zip | |
Merge "Move to the latest rabbitmq"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-server.repo | 10 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 |
3 files changed, 19 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9826ac765..3710a1063 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -62,7 +62,8 @@ COPY yum.conf /etc/yum.conf 'influxdb.repo', 'nfs_ganesha.repo', 'opendaylight.repo', - 'td.repo' + 'td.repo', + 'rabbitmq_rabbitmq-server.repo' ] %} {% set base_yum_repo_keys = [ @@ -327,6 +328,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'A20F259AEB9C94BB' ] %} {% set remote_apt_keys = [ + 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ @@ -340,7 +342,8 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set remote_apt_keys = [ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray', - 'https://download.docker.com/linux/debian/gpg' + 'https://download.docker.com/linux/debian/gpg', + 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] @@ -355,7 +358,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% endif -%} {% endfor %} {% for key in remote_apt_keys | customizable('remote_apt_keys') %} - {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add - + {%- if loop.first %} RUN {% else %} && {% endif %}curl -L {{ key }} | apt-key add - {%- if not loop.last %} \ {% endif -%} {% endfor %} diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo new file mode 100644 index 000000000..82d55cf84 --- /dev/null +++ b/docker/base/rabbitmq_rabbitmq-server.repo @@ -0,0 +1,10 @@ +[rabbitmq_rabbitmq-server] +name=rabbitmq_rabbitmq-server +baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch +repo_gpgcheck=1 +gpgcheck=0 +enabled=1 +gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey +sslverify=1 +sslcacert=/etc/pki/tls/certs/ca-bundle.crt +metadata_expire=300 diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index ce5919edb..3c5229ba8 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -32,3 +32,6 @@ deb https://sensu.global.ssl.fastly.net/apt bionic main # Opendaylight repo deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main + +# rabbitmq repo +deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ xenial main |