From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../ansible/roles/ext-network/handlers/main.yml | 29 ---------- .../ansible/roles/ext-network/tasks/main.yml | 63 ---------------------- .../ansible/roles/ext-network/vars/Debian.yml | 15 ------ .../ansible/roles/ext-network/vars/RedHat.yml | 15 ------ .../ansible/roles/ext-network/vars/main.yml | 10 ---- 5 files changed, 132 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/ext-network/handlers/main.yml delete mode 100644 deploy/adapters/ansible/roles/ext-network/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/ext-network/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/ext-network/vars/main.yml (limited to 'deploy/adapters/ansible/roles/ext-network') diff --git a/deploy/adapters/ansible/roles/ext-network/handlers/main.yml b/deploy/adapters/ansible/roles/ext-network/handlers/main.yml deleted file mode 100644 index 263b2c5f..00000000 --- a/deploy/adapters/ansible/roles/ext-network/handlers/main.yml +++ /dev/null @@ -1,29 +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 neutron-plugin-openvswitch-agent - service: name=neutron-openvswitch-agent state=restarted enabled=yes - when: "'opendaylight' not in {{ NEUTRON_MECHANISM_DRIVERS }}" - -- name: restart neutron-l3-agent - service: name=neutron-l3-agent state=restarted enabled=yes - -- name: kill dnsmasq - command: killall dnsmasq - ignore_errors: "True" - -- name: restart neutron-dhcp-agent - service: name=neutron-dhcp-agent state=restarted enabled=yes - -- name: restart neutron-metadata-agent - service: name=neutron-metadata-agent state=restarted enabled=yes - -- name: restart xorp - service: name=xorp state=restarted enabled=yes sleep=10 - ignore_errors: "True" diff --git a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml deleted file mode 100644 index eb95f636..00000000 --- a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml +++ /dev/null @@ -1,63 +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" - -# FIXME: temporary workaround for openstack api access random failure -- name: restart api server - service: name={{ item }} state=restarted enabled=yes - with_items: api_services | union(api_services_noarch) - ignore_errors: "True" - -- name: restart neutron server - service: name=neutron-server state=restarted enabled=yes - -- name: wait for neutron ready - wait_for: port=9696 delay=10 timeout=60 host={{ internal_ip }} - -- name: create external net - os_network: - cloud: opnfv - name: "{{ public_net_info.network }}" - provider_network_type: "{{ public_net_info.type }}" - provider_physical_network: "{{ public_net_info.provider_network }}" - shared: false - external: "yes" - state: present - run_once: true - when: public_net_info.enable == "True" - and public_net_info.type == "flat" - -- name: create external net - os_network: - cloud: opnfv - name: "{{ public_net_info.network }}" - provider_network_type: "{{ public_net_info.type }}" - provider_segmentation_id: "{{ public_net_info.segment_id }}" - shared: false - external: "yes" - state: present - run_once: true - when: public_net_info.enable == "True" - and public_net_info.type != "flat" - -- name: create external subnet - os_subnet: - cloud: opnfv - name: "{{ public_net_info.subnet }}" - network_name: "{{ public_net_info.network }}" - cidr: "{{ public_net_info.floating_ip_cidr }}" - enable_dhcp: "{{ public_net_info.enable_dhcp }}" - no_gateway_ip: "{{ public_net_info.no_gateway }}" - gateway_ip: "{{ public_net_info.external_gw }}" - allocation_pool_start: "{{ public_net_info.floating_ip_start }}" - allocation_pool_end: "{{ public_net_info.floating_ip_end }}" - state: present - run_once: true - when: public_net_info.enable == "True" diff --git a/deploy/adapters/ansible/roles/ext-network/vars/Debian.yml b/deploy/adapters/ansible/roles/ext-network/vars/Debian.yml deleted file mode 100644 index 069afc14..00000000 --- a/deploy/adapters/ansible/roles/ext-network/vars/Debian.yml +++ /dev/null @@ -1,15 +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 -############################################################################## ---- -api_services: - - nova-api - - glance-api - - heat-api - - heat-api-cfn - - cinder-api diff --git a/deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml b/deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml deleted file mode 100644 index 47fc4a32..00000000 --- a/deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml +++ /dev/null @@ -1,15 +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 -############################################################################## ---- -api_services: - - openstack-nova-api - - openstack-glance-api - - openstack-heat-api - - openstack-heat-api-cfn - - openstack-cinder-api diff --git a/deploy/adapters/ansible/roles/ext-network/vars/main.yml b/deploy/adapters/ansible/roles/ext-network/vars/main.yml deleted file mode 100644 index b19b6ebf..00000000 --- a/deploy/adapters/ansible/roles/ext-network/vars/main.yml +++ /dev/null @@ -1,10 +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 -############################################################################## ---- -api_services_noarch: [] -- cgit 1.2.3-korg