Remove references to unsupported operating systems
All references to Gentoo, SUSE, Debian stretch and Centos-7 are removed. Conditional tasks, ternary operators and variables are simplified where possible OS specific variables files are generalised where possible Change-Id: I2defac928ff0081b262ba31bdb9981274f13b32b
This commit is contained in:
parent
3f07f8ad90
commit
06ac9563a4
@ -106,13 +106,6 @@
|
|||||||
changed_when: false
|
changed_when: false
|
||||||
listen: Enable hostnamed
|
listen: Enable hostnamed
|
||||||
|
|
||||||
# NOTE(hwoarang) openSUSE randomly fails to start the service
|
|
||||||
# with an error like the following one
|
|
||||||
# sysctl-container.service: Failed at step CGROUP spawning /sbin/sysctl: No such device
|
|
||||||
# Until this is fixed, we workaround it by simply retrying a few more times
|
|
||||||
# before giving up
|
|
||||||
# https://bugzilla.suse.com/show_bug.cgi?id=1055426
|
|
||||||
# https://bugs.launchpad.net/openstack-ansible/+bug/1712741
|
|
||||||
- name: Enable container sysctl service
|
- name: Enable container sysctl service
|
||||||
service:
|
service:
|
||||||
name: "sysctl-container"
|
name: "sysctl-container"
|
||||||
|
@ -22,16 +22,14 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Debian
|
- name: Debian
|
||||||
versions:
|
versions:
|
||||||
- stretch
|
- buster
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- bionic
|
- bionic
|
||||||
|
- focal
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
- 8
|
- 8
|
||||||
- name: opensuse
|
|
||||||
versions:
|
|
||||||
- 15.0
|
|
||||||
categories:
|
categories:
|
||||||
- cloud
|
- cloud
|
||||||
- lxc
|
- lxc
|
||||||
|
@ -56,5 +56,3 @@
|
|||||||
vars:
|
vars:
|
||||||
btrfs_package:
|
btrfs_package:
|
||||||
apt: "btrfs-progs"
|
apt: "btrfs-progs"
|
||||||
yum: "btrfs-progs"
|
|
||||||
zypper: "btrfsprogs"
|
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2018, Matthew Thode
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
# no official systemd image is published, but machinectl seems to work
|
|
||||||
lxc_container_backing_store: machinectl
|
|
||||||
|
|
||||||
lxc_container_map:
|
|
||||||
distro: gentoo
|
|
||||||
arch: "{{ lxc_architecture_mapping.get( hostvars[physical_host]['ansible_facts']['architecture'] | lower ) }}"
|
|
||||||
release: 17.0-systemd
|
|
||||||
|
|
||||||
lxc_container_default_config_list:
|
|
||||||
- "lxc.start.auto=1"
|
|
||||||
- "lxc.start.delay=15"
|
|
||||||
- "lxc.group=onboot"
|
|
||||||
- "lxc.group=openstack"
|
|
||||||
- "lxc.autodev=1"
|
|
||||||
- "lxc.pty.max=1024"
|
|
||||||
- "lxc.hook.autodev=/var/lib/lxc/{{ inventory_hostname }}/autodev"
|
|
||||||
|
|
||||||
sysctl_path: "/usr/sbin"
|
|
||||||
|
|
||||||
# shared binpkgs and distfiles
|
|
||||||
_lxc_container_bind_mounts:
|
|
||||||
- host_directory: "/openstack/portage/packages"
|
|
||||||
container_directory: "/usr/portage/packages"
|
|
||||||
- host_directory: "/openstack/portage/distfiles"
|
|
||||||
container_directory: "/usr/portage/distfiles"
|
|
@ -1,31 +0,0 @@
|
|||||||
---
|
|
||||||
# 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_container_enable_resolved: false
|
|
||||||
|
|
||||||
lxc_container_map:
|
|
||||||
distro: opensuse
|
|
||||||
arch: amd64
|
|
||||||
release: "{{ hostvars[physical_host]['ansible_facts']['distribution_version'] }}"
|
|
||||||
|
|
||||||
lxc_container_default_config_list:
|
|
||||||
- "lxc.autodev=1"
|
|
||||||
- "lxc.group=onboot"
|
|
||||||
- "lxc.group=openstack"
|
|
||||||
- "lxc.hook.autodev=/var/lib/lxc/{{ inventory_hostname }}/autodev"
|
|
||||||
- "lxc.pty.max=1024"
|
|
||||||
- "lxc.start.auto=1"
|
|
||||||
- "lxc.start.delay=15"
|
|
Loading…
x
Reference in New Issue
Block a user