From 13f5ea886dbe96c54a637f9833d88f375da70d7a Mon Sep 17 00:00:00 2001 From: QiLiang Date: Mon, 5 Sep 2016 14:36:43 +0800 Subject: Bug fix to disable security-group on Mitaka Change-Id: If659c8821a97d05dbaeedc864429f0427e145ab0 JIRA: COMPASS-479 Signed-off-by: QiLiang --- .../ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2 | 4 ++++ .../ansible/openstack_mitaka/roles/secgroup/templates/nova.j2 | 3 +++ .../openstack_mitaka_xenial/roles/secgroup/templates/neutron.j2 | 4 ++++ .../ansible/openstack_mitaka_xenial/roles/secgroup/templates/nova.j2 | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/neutron.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/secgroup/templates/nova.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/neutron.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/nova.j2 (limited to 'deploy') 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 diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/neutron.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/neutron.j2 new file mode 100644 index 00000000..aac6c8a2 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/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_xenial/roles/secgroup/templates/nova.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/nova.j2 new file mode 100644 index 00000000..7dbc216a --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/secgroup/templates/nova.j2 @@ -0,0 +1,3 @@ +[DEFAULT] +firewall_driver = nova.virt.firewall.NoopFirewallDriver +security_group_api = neutron -- cgit 1.2.3-korg