Move LXC AppArmor profile setting to the inventory

To reduce the number of times a container is restarted during the
build process, this patch moves the AA profile definition from
the service playbooks to the inventory.

This ensures that the profile can be applied when the container
is created, rather than after the fact. This, in turn, eliminates
the need to restart the container again and wait for SSH
connectivity to be restored.

There are additional configurations in some playbooks which will
require an additional facility in the lxc_container_create role
to allow something similar for container command execution. The
changes to implement this will follow in another patch once that
facility is available.

Change-Id: I688640cf06a7ed2554210e49275cc3de10371a23
Depends-On: I4c95a231af3306c5010b168e7cc181deecf1a58d
This commit is contained in:
Jesse Pretorius 2016-07-19 16:40:10 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 30dacdf8af
commit 3fa780d98f
5 changed files with 68 additions and 12 deletions

View File

@ -27,16 +27,6 @@
# If extra container configurations are desirable set the # If extra container configurations are desirable set the
# "extra_container_config" list to strings containing the options needed. # "extra_container_config" list to strings containing the options needed.
- name: Set the LXC app-armor profile
lxc_container:
name: "{{ inventory_hostname }}"
container_config:
- "lxc.aa_profile={{ aa_profile | default('lxc-openstack') }}"
delegate_to: "{{ physical_host }}"
when:
- not is_metal | bool
register: _cp
- name: Ensure mount directories exists - name: Ensure mount directories exists
file: file:
path: "{{ item['mount_path'] }}" path: "{{ item['mount_path'] }}"
@ -80,7 +70,6 @@
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
when: when:
- > - >
(_cp is defined and _cp | changed) or
(_bm is defined and _bm | changed) or (_bm is defined and _bm | changed) or
(_ec is defined and _ec | changed) (_ec is defined and _ec | changed)
- not is_metal | bool - not is_metal | bool

View File

@ -0,0 +1,19 @@
---
# 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.
# This is the default LXC AppArmor profile
# Groups which need the unbound profile have a specific override
lxc_container_config_list:
- "lxc.aa_profile=lxc-openstack"

View File

@ -0,0 +1,17 @@
---
# 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.
lxc_container_config_list:
- "lxc.aa_profile=unconfined"

View File

@ -1,2 +1,16 @@
--- ---
galera_client_drop_config_file: true # 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.
galera_client_drop_config_file: true

View File

@ -0,0 +1,17 @@
---
# 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.
lxc_container_config_list:
- "lxc.aa_profile=unconfined"