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>

3 files changed, 0 insertions, 112 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/openstack_mitaka/roles/glance/tasks/nfs.yml
deleted file mode 100644
index 9dc72e31..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/glance/tasks/nfs.yml
+++ /dev/null
@@ -1,68 +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: install nfs packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: nfs_packages
-
-- name: install nfs
-  local_action: yum  name={{ item }} state=present
-  with_items:
-    - rpcbind
-    - nfs-utils
-  run_once: True
-
-- name: create image directory
-  local_action: file path=/opt/images state=directory mode=0777
-  run_once: True
-
-- name: remove nfs config item if exist
-  local_action: lineinfile dest=/etc/exports state=absent
-              regexp="^/opt/images"
-  run_once: True
-
-- name: update nfs config
-  local_action: lineinfile dest=/etc/exports state=present
-              line="/opt/images *(rw,insecure,sync,all_squash)"
-  run_once: True
-
-- name: restart compass nfs service
-  local_action: service name={{ item }} state=restarted enabled=yes
-  with_items:
-      - rpcbind
-      - nfs-server
-  run_once: True
-
-- name: get mount info
-  command: mount
-  register: mount_info
-  tags:
-    - recovery
-
-- name: get nfs server
-  shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
-  register: ip_info
-  tags:
-    - recovery
-
-- name: restart host nfs service
-  service: name={{ item }} state=restarted enabled=yes
-  with_items: '{{ nfs_services }}'
-
-- name: mount image directory
-  shell: |
-    mkdir -p /var/lib/glance/images
-    mount -t nfs -onfsvers=3 {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images
-    sed -i '/\/var\/lib\/glance\/images/d' /etc/fstab
-    #echo {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images/ nfs nfsvers=3 >> /etc/fstab
-  when: mount_info.stdout.find('images') == -1
-  retries: 5
-  delay: 3
-  tags:
-    - recovery
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/Debian.yml
deleted file mode 100644
index d1825012..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/Debian.yml
+++ /dev/null
@@ -1,21 +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:
-  - glance
-  - nfs-common
-
-nfs_packages:
-  - nfs-common
-
-nfs_services: []
-
-services:
-  - glance-registry
-  - glance-api
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/RedHat.yml
deleted file mode 100644
index 2987d0c4..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/glance/vars/RedHat.yml
+++ /dev/null
@@ -1,23 +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:
-  - openstack-glance
-  - rpcbind
-
-nfs_packages:
-  - nfs-utils
-  - rpcbind
-
-nfs_services:
-  - rpcbind
-
-services:
-  - openstack-glance-api
-  - openstack-glance-registry