From 48436849d27ab11f0bb8b2576cda8acdaeaa6364 Mon Sep 17 00:00:00 2001 From: Logan V Date: Fri, 9 Sep 2016 22:17:45 -0500 Subject: [PATCH] Remove Calico qemu configuration It is moved to the Nova role where libvirt/qemu is managed in Id2cfa3353543fecd55f1135abad89f07071e2f60. Depends-On: Id2cfa3353543fecd55f1135abad89f07071e2f60 Change-Id: Ib2d2056962e38f6fa4f96785a333413bf2c2fead --- files/calico-qemu.conf | 7 ------- handlers/main.yml | 6 ------ tasks/calico_config.yml | 14 -------------- 3 files changed, 27 deletions(-) delete mode 100644 files/calico-qemu.conf diff --git a/files/calico-qemu.conf b/files/calico-qemu.conf deleted file mode 100644 index 11c5298e..00000000 --- a/files/calico-qemu.conf +++ /dev/null @@ -1,7 +0,0 @@ -clear_emulator_capabilities = 0 -cgroup_device_acl = [ - "/dev/null", "/dev/full", "/dev/zero", - "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", "/dev/kqemu", - "/dev/rtc", "/dev/hpet", "/dev/net/tun", -] diff --git a/handlers/main.yml b/handlers/main.yml index 937061a8..8547259b 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -13,12 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Restart libvirt-bin - service: - name: "libvirt-bin" - state: "restarted" - pattern: "libvirt-bin" - - name: Restart neutron services service: name: "{{ item.value.service_name }}" diff --git a/tasks/calico_config.yml b/tasks/calico_config.yml index 5be72bae..6b2d91e2 100644 --- a/tasks/calico_config.yml +++ b/tasks/calico_config.yml @@ -34,20 +34,6 @@ - calico-install - calico-pip-packages -- name: Set Calico compatible qemu libvirt config - copy: - src: "calico-qemu.conf" - dest: "/etc/libvirt/qemu.conf" - owner: "root" - group: "root" - mode: "0644" - notify: Restart libvirt-bin - when: - - neutron_services['calico-felix']['group'] in group_names - or neutron_services['calico-dhcp-agent']['group'] in group_names - tags: - - calico-config - - name: Ensure calico config directory exists file: path: "/etc/calico"