Remove per-backend container creation tasks files
The same can be achieved with two ternary operators. Much less code and duplication. Default lxc_container_backing_store to 'dir' to match the lxc_container_create role and further simplify the code. Change-Id: I59bbbcd8a66970a4fb30339aed457b50fb4dad50
This commit is contained in:
parent
51ba33d7f5
commit
7fc5e9950e
@ -74,7 +74,7 @@ lxc_container_cache_path: "/var/cache/lxc/download"
|
||||
# The container backing store can be set to 'overlayfs' to use overlayfs
|
||||
# This should only be done for production use with a linux kernel > 3.14
|
||||
# which is when overlayfs was merged into the mainline kernel
|
||||
# lxc_container_backing_store: overlayfs
|
||||
lxc_container_backing_store: dir
|
||||
|
||||
# The container backing method can be set to 'copy-on-write' to use LVM
|
||||
# snapshot-backed containers when the container backing store is set to
|
||||
|
@ -13,10 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Set backingstore fact
|
||||
set_fact:
|
||||
container_backing_store: "{{ lxc_container_backing_store | default('None') }}"
|
||||
|
||||
- name: Create LXC cache dir
|
||||
file:
|
||||
path: "{{ cache_path_fact }}"
|
||||
@ -72,8 +68,35 @@
|
||||
content: "{{ cache_time }}"
|
||||
dest: "{{ cache_path_fact }}/build_id"
|
||||
|
||||
- include_tasks: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
- "lxc_container_{{ container_backing_store }}.yml"
|
||||
skip: true
|
||||
- name: Create base container to use for {{ lxc_container_backing_store }}-backed containers
|
||||
lxc_container:
|
||||
name: "{{ lxc_container_base_name }}"
|
||||
template: "download"
|
||||
state: stopped
|
||||
backing_store: "{{ (lxc_container_backing_store == 'overlayfs') | ternary('dir', lxc_container_backing_store) }}"
|
||||
zfs_root: "{{ (lxc_container_backing_store == 'zfs') | ternary(lxc_container_zfs_root_name, omit) }}"
|
||||
template_options: "{{ lxc_cache_download_template_options }}"
|
||||
register: cache_download
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: cache_download is success
|
||||
|
||||
- name: Set the qgroup limits for btrfs
|
||||
when:
|
||||
- lxc_container_backing_store == 'btrfs'
|
||||
block:
|
||||
- name: Set the qgroup size|compression limits on machines
|
||||
command: "btrfs qgroup limit {{ item }} /var/lib/lxc/{{ lxc_container_base_name }}"
|
||||
changed_when: false
|
||||
with_items:
|
||||
- "-e {{ lxc_host_machine_qgroup_space_limit }}"
|
||||
- "-c {{ lxc_host_machine_qgroup_compression_limit }}"
|
||||
when:
|
||||
- not lxc_host_machine_quota_disabled
|
||||
rescue:
|
||||
- name: Notice regarding quota system
|
||||
debug:
|
||||
msg: >-
|
||||
There was an error processing the setup of qgroups. Check the system
|
||||
to ensure they're available otherwise disable the quota system by
|
||||
setting `lxc_host_machine_quota_disabled` to true.
|
||||
|
@ -1,44 +0,0 @@
|
||||
---
|
||||
# Copyright 2016, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
- name: Create base container to use for BTRFS-backed containers
|
||||
lxc_container:
|
||||
name: "{{ lxc_container_base_name }}"
|
||||
template: "download"
|
||||
state: stopped
|
||||
backing_store: "btrfs"
|
||||
template_options: "{{ lxc_cache_download_template_options }}"
|
||||
register: cache_download
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: cache_download is success
|
||||
|
||||
- name: Set the qgroup limits
|
||||
block:
|
||||
- name: Set the qgroup size|compression limits on machines
|
||||
command: "btrfs qgroup limit {{ item }} /var/lib/lxc/{{ lxc_container_base_name }}"
|
||||
changed_when: false
|
||||
with_items:
|
||||
- "-e {{ lxc_host_machine_qgroup_space_limit }}"
|
||||
- "-c {{ lxc_host_machine_qgroup_compression_limit }}"
|
||||
when:
|
||||
- not lxc_host_machine_quota_disabled
|
||||
rescue:
|
||||
- name: Notice regarding quota system
|
||||
debug:
|
||||
msg: >-
|
||||
There was an error processing the setup of qgroups. Check the system
|
||||
to ensure they're available otherwise disable the quota system by
|
||||
setting `lxc_host_machine_quota_disabled` to true.
|
@ -1,29 +0,0 @@
|
||||
---
|
||||
# Copyright 2016, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
- name: Create base container to use for LVM-backed copy-on-write containers
|
||||
lxc_container:
|
||||
name: "{{ lxc_container_base_name }}"
|
||||
template: "download"
|
||||
state: stopped
|
||||
backing_store: "lvm"
|
||||
template_options: "{{ lxc_cache_download_template_options }}"
|
||||
register: cache_download
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: cache_download is success
|
||||
when:
|
||||
- lxc_container_backing_method is defined
|
||||
- lxc_container_backing_method == 'copy-on-write'
|
@ -1,26 +0,0 @@
|
||||
---
|
||||
# Copyright 2016, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
- name: Create base container to use for overlayfs containers
|
||||
lxc_container:
|
||||
name: "{{ lxc_container_base_name }}"
|
||||
template: "download"
|
||||
state: stopped
|
||||
backing_store: "dir"
|
||||
template_options: "{{ lxc_cache_download_template_options }}"
|
||||
register: cache_download
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: cache_download is success
|
@ -1,27 +0,0 @@
|
||||
---
|
||||
# Copyright 2016, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
- name: Create base container to use for ZFS-backed containers
|
||||
lxc_container:
|
||||
name: "{{ lxc_container_base_name }}"
|
||||
template: "download"
|
||||
state: stopped
|
||||
backing_store: "zfs"
|
||||
zfs_root: "{{ lxc_container_zfs_root_name }}"
|
||||
template_options: "{{ lxc_cache_download_template_options }}"
|
||||
register: cache_download
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: cache_download is success
|
Loading…
Reference in New Issue
Block a user