From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/ext-network/handlers/main.yml | 29 -------------- .../roles/ext-network/tasks/main.yml | 44 ---------------------- .../roles/ext-network/vars/Debian.yml | 18 --------- .../roles/ext-network/vars/RedHat.yml | 17 --------- .../roles/ext-network/vars/main.yml | 10 ----- 5 files changed, 118 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/handlers/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/main.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/handlers/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/handlers/main.yml deleted file mode 100644 index 36e39072..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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/openstack_newton_xenial/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml deleted file mode 100644 index f68105f1..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/tasks/main.yml +++ /dev/null @@ -1,44 +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 - shell: - . /opt/admin-openrc.sh; - neutron net-create \ - {{ public_net_info.network }} \ - --provider:network_type {{ public_net_info.type }} \ - --provider:physical_network {{ public_net_info.provider_network }} \ - --router:external True - when: public_net_info.enable == True and inventory_hostname == groups['controller'][0] - -- name: create external subnet - shell: - . /opt/admin-openrc.sh; - neutron subnet-create \ - --name {{ public_net_info.subnet }} \ - --gateway {{ public_net_info.external_gw }} \ - --allocation-pool \ - start={{ public_net_info.floating_ip_start }},end={{ public_net_info.floating_ip_end }} \ - {{ public_net_info.network }} {{ public_net_info.floating_ip_cidr }} - when: public_net_info.enable == True and inventory_hostname == groups['controller'][0] - diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/Debian.yml deleted file mode 100644 index 0b5c78b6..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/Debian.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 -############################################################################## ---- -api_services: - - nova-api - - glance-api - - ceilometer-api - - heat-api - - heat-api-cfn - - aodh-api - - cinder-api - diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/RedHat.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/RedHat.yml deleted file mode 100644 index 886401fd..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/RedHat.yml +++ /dev/null @@ -1,17 +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-ceilometer-api - - openstack-heat-api - - openstack-heat-api-cfn - - openstack-cinder-api - diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ext-network/vars/main.yml deleted file mode 100644 index b19b6ebf..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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