openstack-heat: Drop flannel for cloud Routes API

This commit is contained in:
Angus Lees
2016-09-02 16:38:52 +10:00
parent 0b57371ffa
commit 29fadb3541
7 changed files with 55 additions and 64 deletions

View File

@@ -18,6 +18,27 @@ bridge-utils:
- mode: 644
- makedirs: true
{% if grains.cloud is defined and grains.cloud == 'openstack' %}
cbr0:
# workaround https://github.com/saltstack/salt/issues/20570
kmod.present:
- name: bridge
network.managed:
- enabled: True
- type: bridge
- proto: none
- ports: none
- bridge: cbr0
- delay: 0
- bypassfirewall: True
- require_in:
- service: docker
- require:
- kmod: cbr0
{% endif %}
{% if (grains.os == 'Fedora' and grains.osrelease_info[0] >= 22) or (grains.os == 'CentOS' and grains.osrelease_info[0] >= 7) %}
docker:
@@ -512,4 +533,3 @@ docker:
- cmd: fix-service-docker
{% endif %}
{% endif %} # end grains.os_family != 'RedHat'