openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Remove Calico qemu configuration

Browse Source 
It is moved to the Nova role where libvirt/qemu is managed in
Id2cfa3353543fecd55f1135abad89f07071e2f60.

Depends-On: Id2cfa3353543fecd55f1135abad89f07071e2f60
Change-Id: Ib2d2056962e38f6fa4f96785a333413bf2c2fead
This commit is contained in:
Logan V 2016-09-09 22:17:45 -05:00 committed by Jesse Pretorius (odyssey4me)
parent 3a8b9ffc79
commit 48436849d2
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/calico-qemu.conf
View File

@ -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",
]

6
handlers/main.yml
View File

@ -13,12 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Restart libvirt-bin
service:
name: "libvirt-bin"
state: "restarted"
pattern: "libvirt-bin"
- name: Restart neutron services - name: Restart neutron services
service: service:
name: "{{ item.value.service_name }}" name: "{{ item.value.service_name }}"

14
tasks/calico_config.yml
View File

@ -34,20 +34,6 @@
- calico-install - calico-install
- calico-pip-packages - 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 - name: Ensure calico config directory exists
file: file:
path: "/etc/calico" path: "/etc/calico"