Skip to content

Commit

Permalink
Move LXC AppArmor profile setting to the inventory
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jesse Pretorius committed Jul 23, 2016
1 parent 30dacdf commit 3fa780d
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 12 deletions.
11 changes: 0 additions & 11 deletions playbooks/common-tasks/os-lxc-container-setup.yml
Expand Up @@ -27,16 +27,6 @@
# If extra container configurations are desirable set the
# "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
file:
path: "{{ item['mount_path'] }}"
Expand Down Expand Up @@ -80,7 +70,6 @@
delegate_to: "{{ physical_host }}"
when:
- >
(_cp is defined and _cp | changed) or
(_bm is defined and _bm | changed) or
(_ec is defined and _ec | changed)
- not is_metal | bool
Expand Down
19 changes: 19 additions & 0 deletions playbooks/inventory/group_vars/all_containers.yml
@@ -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"
17 changes: 17 additions & 0 deletions playbooks/inventory/group_vars/cinder_volume.yml
@@ -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"
16 changes: 15 additions & 1 deletion playbooks/inventory/group_vars/galera_all.yml
@@ -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
17 changes: 17 additions & 0 deletions playbooks/inventory/group_vars/neutron_agent.yml
@@ -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"

0 comments on commit 3fa780d

Please sign in to comment.