summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/secgroup
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/secgroup')
-rw-r--r--deploy/adapters/ansible/roles/secgroup/handlers/main.yml18
-rw-r--r--deploy/adapters/ansible/roles/secgroup/tasks/main.yml20
-rw-r--r--deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml41
-rw-r--r--deploy/adapters/ansible/roles/secgroup/templates/neutron.j27
-rw-r--r--deploy/adapters/ansible/roles/secgroup/templates/nova.j23
-rw-r--r--deploy/adapters/ansible/roles/secgroup/vars/Debian.yml35
-rw-r--r--deploy/adapters/ansible/roles/secgroup/vars/RedHat.yml35
-rw-r--r--deploy/adapters/ansible/roles/secgroup/vars/main.yml11
8 files changed, 0 insertions, 170 deletions
diff --git a/deploy/adapters/ansible/roles/secgroup/handlers/main.yml b/deploy/adapters/ansible/roles/secgroup/handlers/main.yml
deleted file mode 100644
index a947c7cd..00000000
--- a/deploy/adapters/ansible/roles/secgroup/handlers/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- name: restart controller relation service
- service: name={{ item }} state=restarted enabled=yes
- ignore_errors: "True"
- with_items: "{{ controller_services }}"
-
-- name: restart compute relation service
- service: name={{ item }} state=restarted enabled=yes
- ignore_errors: "True"
- with_items: "{{ compute_services }}"
diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml b/deploy/adapters/ansible/roles/secgroup/tasks/main.yml
deleted file mode 100644
index 43a3f7f9..00000000
--- a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- include_vars: "{{ ansible_os_family }}.yml"
- tags: secgroup
-
-- debug: msg={{ enable_secgroup }}
- tags: secgroup
-
-- include: secgroup.yml
- when: '{{ enable_secgroup }} == False'
- tags: secgroup
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml b/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml
deleted file mode 100644
index 4efb13e9..00000000
--- a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- name: make sure template dir exits
- file: path=/opt/os_templates state=directory mode=0755
- tags: secgroup
-
-- name: copy configs
- template: src={{ item }} dest=/opt/os_templates
- with_items:
- - nova.j2
- - neutron.j2
- tags: secgroup
-
-- name: update controller configs
- shell: |
- "[ -f '{{ item.1 }}' ] && crudini --merge '{{ item.1 }}' \
- < /opt/os_templates/{{ item.0.src }} || /bin/true"
- tags: secgroup
- with_subelements:
- - "{{ configs_templates }}"
- - dest
- notify: restart controller relation service
- when: inventory_hostname in "{{ groups['controller'] }}"
-
-- name: update compute configs
- shell: |
- "[ -f '{{ item.1 }}' ] && crudini --merge '{{ item.1 }}' \
- < /opt/os_templates/{{ item.0.src }} || /bin/true"
- tags: secgroup
- with_subelements:
- - "{{ configs_templates }}"
- - dest
- notify: restart compute relation service
- when: inventory_hostname in "{{ groups['compute'] }}"
diff --git a/deploy/adapters/ansible/roles/secgroup/templates/neutron.j2 b/deploy/adapters/ansible/roles/secgroup/templates/neutron.j2
deleted file mode 100644
index e7107660..00000000
--- a/deploy/adapters/ansible/roles/secgroup/templates/neutron.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-[securitygroup]
-firewall_driver = neutron.agent.firewall.NoopFirewallDriver
-enable_security_group = True
-
-[agent]
-prevent_arp_spoofing = False
-
diff --git a/deploy/adapters/ansible/roles/secgroup/templates/nova.j2 b/deploy/adapters/ansible/roles/secgroup/templates/nova.j2
deleted file mode 100644
index 7dbc216a..00000000
--- a/deploy/adapters/ansible/roles/secgroup/templates/nova.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
-security_group_api = neutron
diff --git a/deploy/adapters/ansible/roles/secgroup/vars/Debian.yml b/deploy/adapters/ansible/roles/secgroup/vars/Debian.yml
deleted file mode 100644
index 221a3d92..00000000
--- a/deploy/adapters/ansible/roles/secgroup/vars/Debian.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-configs_templates:
- - src: nova.j2
- dest:
- - /etc/nova/nova.conf
- - src: neutron.j2
- dest:
- - /etc/neutron/plugins/ml2/ml2_conf.ini
- - /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
- - /etc/neutron/plugins/ml2/restproxy.ini
-
-controller_services:
- - nova-api
- - nova-cert
- - nova-conductor
- - nova-consoleauth
- - nova-novncproxy
- - nova-scheduler
- - neutron-server
- - neutron-openvswitch-agent
- - neutron-l3-agent
- - neutron-dhcp-agent
- - neutron-metadata-agent
-
-compute_services:
- - nova-compute
- - neutron-openvswitch-agent
diff --git a/deploy/adapters/ansible/roles/secgroup/vars/RedHat.yml b/deploy/adapters/ansible/roles/secgroup/vars/RedHat.yml
deleted file mode 100644
index 4c04f6dc..00000000
--- a/deploy/adapters/ansible/roles/secgroup/vars/RedHat.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-configs_templates:
- - src: nova.j2
- dest:
- - /etc/nova/nova.conf
- - src: neutron.j2
- dest:
- - /etc/neutron/plugins/ml2/ml2_conf.ini
- - /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
- - /etc/neutron/plugins/ml2/restproxy.ini
-
-controller_services:
- - openstack-nova-api
- - openstack-nova-cert
- - openstack-nova-conductor
- - openstack-nova-consoleauth
- - openstack-nova-novncproxy
- - openstack-nova-scheduler
- - neutron-openvswitch-agent
- - neutron-l3-agent
- - neutron-dhcp-agent
- - neutron-metadata-agent
- - neutron-server
-
-compute_services:
- - openstack-nova-compute
- - neutron-openvswitch-agent
diff --git a/deploy/adapters/ansible/roles/secgroup/vars/main.yml b/deploy/adapters/ansible/roles/secgroup/vars/main.yml
deleted file mode 100644
index 209e1e00..00000000
--- a/deploy/adapters/ansible/roles/secgroup/vars/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-packages_noarch: []
-metering_secret: 1c5df72079b31fb47747