summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2018-07-12 18:38:04 +0200
committerMartin André <m.andre@redhat.com>2018-07-13 07:51:37 +0200
commit9f481aba248c92c91ffa945164e37a34bc0dbee6 (patch)
treeff413d0ad764b6e41e37d1b2fdefbcf29a58108e
parent932f31593a5d94c3650173d9e081d09ed4266227 (diff)
Pin dep for sensu-plugins-dns
At least until the upstream gem is fixed. Change-Id: Id443727cb57389af8d733fd52bc90c35dbedbfc4 Closes-Bug: #1781434
Notes
Notes (review): Code-Review+2: Mark Goddard <mark@stackhpc.com> Code-Review+2: Jeffrey Zhang <zhang.lei.fly@gmail.com> Workflow+1: Jeffrey Zhang <zhang.lei.fly@gmail.com> Code-Review+2: Eduardo Gonzalez <dabarren@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 13 Jul 2018 08:43:34 +0000 Reviewed-on: https://review.openstack.org/582299 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/sensu/sensu-client/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2
index 718f05b..ec6c39f 100644
--- a/docker/sensu/sensu-client/Dockerfile.j2
+++ b/docker/sensu/sensu-client/Dockerfile.j2
@@ -46,6 +46,11 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
46 46
47{% block sensu_clients_install %} 47{% block sensu_clients_install %}
48 48
49{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
50# FIXME(mandre) Workaround for https://bugs.launchpad.net/kolla/+bug/1781434
51RUN gem install public_suffix:"~>2"
52{% endif %}
53
49# Sensu plugins are all using semantic versioning. 54# Sensu plugins are all using semantic versioning.
50# Let's cap them to the known major version that works with the ruby shipped on 55# Let's cap them to the known major version that works with the ruby shipped on
51# rhel/centos/oraclelinux (currently 2.0) 56# rhel/centos/oraclelinux (currently 2.0)