master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>

5 files changed, 74 insertions, 31 deletions

diff --git a/deploy/adapters/ansible/roles/ext-network/handlers/main.yml b/deploy/adapters/ansible/roles/ext-network/handlers/main.yml
index a7945861..36e39072 100644
--- a/deploy/adapters/ansible/roles/ext-network/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/ext-network/handlers/main.yml
@@ -8,7 +8,7 @@
 ##############################################################################
 ---
 - name: restart neutron-plugin-openvswitch-agent
-  service: name=neutron-plugin-openvswitch-agent state=restarted enabled=yes
+  service: name=neutron-openvswitch-agent state=restarted enabled=yes
   when: "'opendaylight' not in {{ NEUTRON_MECHANISM_DRIVERS }}"
 
 - name: restart neutron-l3-agent
diff --git a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
index cb6cb2ce..f68105f1 100644
--- a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
@@ -7,40 +7,38 @@
 # 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
-  neutron_network:
-    login_username: ADMIN
-    login_password: "{{ ADMIN_PASS }}"
-    login_tenant_name: admin
-    auth_url: "http://{{ internal_vip.ip }}:35357/v2.0"
-    name: "{{ public_net_info.network }}"
-    provider_network_type: "{{ public_net_info.type }}"
-    provider_physical_network: "{{ public_net_info.provider_network }}"
-    provider_segmentation_id: "{{ public_net_info.segment_id}}"
-    shared: false
-    router_external: yes
-    state: present
-  run_once: true
-  when: 'public_net_info.enable == True'
+  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
-  neutron_subnet:
-    login_username: ADMIN
-    login_password: "{{ ADMIN_PASS }}"
-    login_tenant_name: admin
-    auth_url: "http://{{ internal_vip.ip }}:35357/v2.0"
-    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: "{{ 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'
+  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/roles/ext-network/vars/Debian.yml b/deploy/adapters/ansible/roles/ext-network/vars/Debian.yml
new file mode 100644
index 00000000..0b5c78b6
--- /dev/null
+++ b/deploy/adapters/ansible/roles/ext-network/vars/Debian.yml
@@ -0,0 +1,18 @@
+##############################################################################
+# 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/roles/ext-network/vars/RedHat.yml b/deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml
new file mode 100644
index 00000000..886401fd
--- /dev/null
+++ b/deploy/adapters/ansible/roles/ext-network/vars/RedHat.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# 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/roles/ext-network/vars/main.yml b/deploy/adapters/ansible/roles/ext-network/vars/main.yml
new file mode 100644
index 00000000..b19b6ebf
--- /dev/null
+++ b/deploy/adapters/ansible/roles/ext-network/vars/main.yml
@@ -0,0 +1,10 @@
+##############################################################################
+# 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: []