openstack/openstack-ansible-lxc_hosts
Code Issues Proposed changes

Merge "tasks: Set systemd installation prefix"

Browse Source
This commit is contained in:
Jenkins 2017-04-25 16:57:15 +00:00 committed by Gerrit Code Review
commit 43a2df281a
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/lxc_cache_preparation_systemd_old.yml
View File

@ -65,8 +65,8 @@
# the following ML post resolves the bug. # the following ML post resolves the bug.
# * https://lists.freedesktop.org/archives/systemd-devel/2015-March/029151.html # * https://lists.freedesktop.org/archives/systemd-devel/2015-March/029151.html
- name: Move machined service into place - name: Move machined service into place
copy: template:
src: systemd-machined.service src: systemd-machined.service.j2
dest: /etc/systemd/system/systemd-machined.service dest: /etc/systemd/system/systemd-machined.service
register: machined_unit register: machined_unit
when: when:

2
files/systemd-machined.service → templates/systemd-machined.service.j2
View File

@ -13,7 +13,7 @@ Wants=machine.slice
After=machine.slice After=machine.slice
[Service] [Service]
ExecStart=/lib/systemd/systemd-machined ExecStart={{ systemd_utils_prefix }}/systemd-machined
BusName=org.freedesktop.machine1 BusName=org.freedesktop.machine1
CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID
WatchdogSec=3min WatchdogSec=3min

1
vars/redhat-7.yml
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
system_config_dir: "/etc/sysconfig" system_config_dir: "/etc/sysconfig"
systemd_utils_prefix: "/lib/systemd"
# Required rpm packages. # Required rpm packages.
lxc_hosts_distro_packages: lxc_hosts_distro_packages:

1
vars/ubuntu-16.04.yml
View File

@ -43,6 +43,7 @@ lxc_hosts_distro_packages:
lxc_xz_bin: pxz lxc_xz_bin: pxz
system_config_dir: "/etc/default" system_config_dir: "/etc/default"
systemd_utils_prefix: "/lib/systemd"
lxc_cache_map: lxc_cache_map:
distro: ubuntu distro: ubuntu
arch: "{{ lxc_architecture_mapping.get( ansible_architecture ) }}" arch: "{{ lxc_architecture_mapping.get( ansible_architecture ) }}"