diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-13 17:59:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-13 17:59:49 +0000 |
| commit | b7e9a6e123891680e839da5292c73de164912bb2 (patch) | |
| tree | bd9e5b220eb68421ed2da10ad502abe22f196d9b /docker | |
| parent | 7ac77d9daa5917132b1c8a63bfe3daf2803e7469 (diff) | |
| parent | 682bfd2b4a70535019acea449efab5cd1a33f21a (diff) | |
| download | kolla-b7e9a6e123891680e839da5292c73de164912bb2.tar.gz kolla-b7e9a6e123891680e839da5292c73de164912bb2.zip | |
Merge "Set ES_SKIP_SET_KERNEL_PARAMETERS in elasticsearch image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 8f6adf9d4..22e2d379e 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -25,6 +25,8 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ {% endif %} +ENV ES_SKIP_SET_KERNEL_PARAMETERS true + {{ macros.install_packages(elasticsearch_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start |