diff options
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/sensu/sensu-client/Dockerfile.j2 | 7 | ||||
| -rwxr-xr-x | kolla/common/config.py | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 295f37ae2..2309aff2a 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -53,7 +53,8 @@ ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_graf # NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing. # NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH. # This is forced for all distros to avoid conflicts with native packages. -RUN gem install rake:"~>12" fpm \ +# NOTE(mgoddard): childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3. +RUN gem install rake:"~>12" ffi:"<1.13.0" childprocess:"<2.0.0" fpm \ && curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \ && mkdir -p ${monasca_grafana_build_path} \ && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \ diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index 9ccd4f3ae..90f6bff45 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -9,13 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set sensu_client_packages = [ 'ceph-common', 'cyrus-sasl-devel', - 'docker-client', 'gcc-c++', 'make', 'mariadb', 'ntp', 'ruby-devel' ] %} + {% if base_distro != 'oraclelinux' %} + # NOTE(mgoddard): Installing docker-client fails on OracleLinux. + {% set sensu_client_packages = sensu_client_packages + [ + 'docker-client', + ] %} + {% endif %} {% if distro_python_version.startswith('3') %} {% set sensu_client_packages = sensu_client_packages + [ diff --git a/kolla/common/config.py b/kolla/common/config.py index 365e469eb..6d4ddab37 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -315,7 +315,7 @@ SOURCES = { 'bifrost-base': { 'type': 'url', 'location': ('$tarballs_base/bifrost/' - 'bifrost-6.0.3.tar.gz')}, + 'bifrost-6.0.4.tar.gz')}, 'blazar-base': { 'type': 'url', 'location': ('$tarballs_base/blazar/' |