openstack/openstack-ansible
Code Issues Proposed changes

Convert lxc2 config keys to lxc3 format

Browse Source 
Depends-On: https://review.opendev.org/756587
Change-Id: If3217b0020fb515641731a7301fb96066c669a8c
This commit is contained in:
Jonathan Rosser 2020-10-06 11:33:27 +01:00
parent ce83c54e44
commit 7ec0a966ab
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/group_vars/all_containers.yml
View File

@ -16,7 +16,7 @@
# This is the default LXC AppArmor profile # This is the default LXC AppArmor profile
# Groups which need the unbound profile have a specific override # Groups which need the unbound profile have a specific override
lxc_container_config_list: lxc_container_config_list:
- "{{ (hostvars[physical_host]['ansible_distribution'] == 'Debian' and hostvars[physical_host]['ansible_distribution_major_version'] == '10' ) | ternary('lxc.aa_profile=unconfined', 'lxc.aa_profile=lxc-openstack') }}" - "lxc.apparmor.profile={{ (hostvars[physical_host]['ansible_distribution'] == 'Debian' and hostvars[physical_host]['ansible_distribution_major_version'] == '10' ) | ternary('unconfined', 'lxc-openstack') }}"
# Needed by playbooks/common-tasks/os-lxc-container-setup.yml # Needed by playbooks/common-tasks/os-lxc-container-setup.yml
lxc_container_log_path: "/var/log/lxc" lxc_container_log_path: "/var/log/lxc"

2
inventory/group_vars/cinder_volume.yml
View File

@ -19,4 +19,4 @@
cinder_backend_rbd_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.rbd.RBDDriver") != -1 }}' cinder_backend_rbd_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.rbd.RBDDriver") != -1 }}'
lxc_container_config_list: lxc_container_config_list:
- "lxc.aa_profile=unconfined" - "lxc.apparmor.profile=unconfined"

2
inventory/group_vars/neutron_agent.yml
View File

@ -21,7 +21,7 @@ neutron_dhcp_config:
dhcp-ignore: "tag:!known" dhcp-ignore: "tag:!known"
lxc_container_config_list: lxc_container_config_list:
- "lxc.aa_profile=unconfined" - "lxc.apparmor.profile=unconfined"
# Ensure that all neutron agent containers get a fixed mac address # Ensure that all neutron agent containers get a fixed mac address
lxc_container_fixed_mac: true lxc_container_fixed_mac: true