From a61544113f142d9c20c183f8860616f85ded5f88 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 14 Aug 2017 16:36:05 -0400 Subject: [PATCH] Create glean@.service.d/override.conf On systemd systems, so everything except ubuntu-trusty. Set --no-dns because we run a local unbound service and never want to use clouds DNS servers. Change-Id: I88c0c6aecfd026d32f3bab17e20e81f4201092d4 Depends-On: I0cfd83ab4208e3a35d7674c5fc34cd209d340074 Signed-off-by: Paul Belanger --- .../nodepool-base/finalise.d/89-glean | 34 +++++++++++++++++++ .../glean@.service.d/override.conf | 2 ++ 2 files changed, 36 insertions(+) create mode 100755 nodepool/elements/nodepool-base/finalise.d/89-glean create mode 100644 nodepool/elements/nodepool-base/glean@.service.d/override.conf diff --git a/nodepool/elements/nodepool-base/finalise.d/89-glean b/nodepool/elements/nodepool-base/finalise.d/89-glean new file mode 100755 index 0000000000..312024c68b --- /dev/null +++ b/nodepool/elements/nodepool-base/finalise.d/89-glean @@ -0,0 +1,34 @@ +#!/bin/bash +# Copyright (C) 2011-2013 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. + +# dib-lint: disable=set setu setpipefail indent +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -e + +case "$DIB_INIT_SYSTEM" in + systemd) + glean_path_dib="/etc/systemd/system/glean@.service.d" + mkdir -p $glean_path_dib + nodepool_base="$(dirname $0)/../glean@.service.d" + cp -RP $nodepool_base/override.conf $glean_path_dib/override.conf + ;; + *) + echo "Skipping glean systemd configuration" + ;; +esac diff --git a/nodepool/elements/nodepool-base/glean@.service.d/override.conf b/nodepool/elements/nodepool-base/glean@.service.d/override.conf new file mode 100644 index 0000000000..202216cc89 --- /dev/null +++ b/nodepool/elements/nodepool-base/glean@.service.d/override.conf @@ -0,0 +1,2 @@ +[Service] +Environment="ARGS=--interface %I --skip-dns"