summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka/roles
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-09-08 02:23:59 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-08 02:23:59 +0000
commitaf5806f65e1cd6db7d8933417ab43f4f94b9b3f4 (patch)
treec7f227ec8b332993cf3dcb19a216e8e4e940b7d2 /deploy/adapters/ansible/openstack_mitaka/roles
parent9c3152b58d1f82fd229d6528be5c1628ca822ef2 (diff)
parent13f5ea886dbe96c54a637f9833d88f375da70d7a (diff)
Merge "Bug fix to disable security-group on Mitaka"
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka/roles')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j24
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j23
2 files changed, 7 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2
new file mode 100644
index 00000000..aac6c8a2
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2
@@ -0,0 +1,4 @@
+[securitygroup]
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+enable_security_group = True
+
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j2
new file mode 100644
index 00000000..7dbc216a
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j2
@@ -0,0 +1,3 @@
+[DEFAULT]
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+security_group_api = neutron