d1c45fb0cb
Previously psmisc was not installed by default, causing the killall in the lxc-dnsmasq systemd unit file to silently fail if killall wasn't found. This prevented running instances of dnsmasq to be torn down when restarting the service. This would exhibit as a problem during upgrades as the older dnsmasq service would be running and the new service would be unable to take over the port. This would cause lxc containers to lose connectivity. This commit switches to using pkill and ensures procps is always installed by default. Change-Id: I4fa838706f1163fd68ff68258bfc66cbf13bad94
50 lines
1.3 KiB
YAML
50 lines
1.3 KiB
YAML
---
|
|
# Copyright 2016, Rackspace US, Inc.
|
|
# Copyright 2017, SUSE LINUX GmbH.
|
|
#
|
|
# 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.
|
|
|
|
lxc_hosts_external_repo: []
|
|
|
|
system_config_dir: "/etc/sysconfig"
|
|
systemd_utils_prefix: "/usr/lib/systemd"
|
|
|
|
# Required rpm packages.
|
|
_lxc_hosts_distro_packages:
|
|
- apparmor-parser
|
|
- apparmor-profiles
|
|
- apparmor-utils
|
|
- aria2
|
|
- bridge-utils
|
|
- btrfsprogs
|
|
- dbus-1
|
|
- dnsmasq
|
|
- git-core
|
|
- libseccomp2
|
|
- lxc
|
|
- liblxc-devel
|
|
- procps
|
|
- python-lxc-python2
|
|
- systemd-container
|
|
- xz
|
|
|
|
lxc_xz_bin: xz
|
|
|
|
lxc_cached_network_interfaces:
|
|
- src: "lxc-net-suse-bridge.cfg.j2"
|
|
dest: "/etc/sysconfig/network/ifcfg-{{ lxc_net_bridge }}"
|
|
- src: "lxc-net-suseredhat-postdown.cfg.j2"
|
|
dest: "/etc/sysconfig/network/scripts/ifdown-post-{{ lxc_net_bridge }}"
|
|
mode: "0755"
|
|
interface: "${1}"
|