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, 82 deletions

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/ceph_openstack_post.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/ceph_openstack_post.yml
deleted file mode 100644
index 2097ca57..00000000
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/ceph_openstack_post.yml
+++ /dev/null
@@ -1,19 +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: get mount info
-  command: mount
-  register: mount_info
-
-- name: try unmount image nfs directory
-  shell: |
-    umount /var/lib/glance/images
-    sed -i '/\/var\/lib\/glance\/images/d' /etc/fstab
-  when: mount_info.stdout.find('images') != -1
-
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/main.yml
deleted file mode 100644
index 06c3acb6..00000000
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/tasks/main.yml
+++ /dev/null
@@ -1,33 +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:
-    - ceph_deploy
-    - ceph_openstack_pre
-    - ceph_openstack_conf
-    - ceph_openstack_post
-    - ceph_openstack
-
-- include: ceph_openstack_pre.yml
-  tags:
-    - ceph_deploy
-    - ceph_openstack_pre
-    - ceph_openstack
-
-- include: ceph_openstack_conf.yml
-  tags:
-    - ceph_deploy
-    - ceph_openstack_conf
-    - ceph_openstack
-
-- include: ceph_openstack_post.yml
-  tags:
-    - ceph_deploy
-    - ceph_openstack_post
-    - ceph_openstack
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/vars/Debian.yml
deleted file mode 100755
index db10bd14..00000000
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceph-openstack/vars/Debian.yml
+++ /dev/null
@@ -1,30 +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:
-  - ceph-deploy
-  - python-flask
-  - libgoogle-perftools4
-  - libleveldb1v5
-  - liblttng-ust0
-  - libsnappy1v5
-  - librbd1
-  - librados2
-  - python-ceph
-  - ceph
-  - ceph-mds
-  - ceph-common
-  - ceph-fs-common
-  - gdisk
-
-services: []
-
-cinder_service: cinder-volume
-nova_service: nova-compute
-glance_service: glance-api