diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-09-08 02:23:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 02:23:06 +0000 |
| commit | 6e91d5e0d868040ff2a7ca9dd80f575dd17fb0c3 (patch) | |
| tree | 221f8626d0393745717ccb8adf28a1c160b8a5d5 /deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates | |
| parent | f294300a38ea35d2ce5e51ad0110137d6e22086d (diff) | |
| parent | 0f90540413da050ca14d6b7b049eb584e661f666 (diff) | |
Merge "Bug fix to disable security-group on Mitaka" into stable/colorado
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2 | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j2 | 3 |
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 |