From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
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 <liyuenan@huawei.com>
---
 .../roles/swift/tasks/swift-compute1.yml           | 80 ----------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/swift/tasks/swift-compute1.yml

(limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/swift/tasks/swift-compute1.yml')

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/swift/tasks/swift-compute1.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/swift/tasks/swift-compute1.yml
deleted file mode 100644
index be00484b..00000000
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/swift/tasks/swift-compute1.yml
+++ /dev/null
@@ -1,80 +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: disable auto start
-  copy:
-    content: "#!/bin/sh\nexit 101"
-    dest: "/usr/sbin/policy-rc.d"
-    mode: 0755
-  when: ansible_os_family == "Debian"
-
-- name: install swift-compute packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: compute_packages | union(compute_packages_noarch)
-
-- name: enable auto start
-  file:
-    path=/usr/sbin/policy-rc.d
-    state=absent
-  when: ansible_os_family == "Debian"
-
-- name: format devices
-  shell: >
-    dd if=/dev/zero of=/var/swift1 bs=1G count=10;
-    dd if=/dev/zero of=/var/swift2 bs=1G count=10;
-    mkfs.xfs /var/swift1;
-    mkfs.xfs /var/swift2;
-
-- name: create mount point dirertory
-  shell: >
-    mkdir -p /srv/node/swift1;
-    mkdir -p /srv/node/swift2;
-
-- name: edit /etc/fstab
-  shell: >
-    echo "/var/swift1 /srv/node/swift1/ xfs noatime,nodiratime,nobarrier,logbufs=8 0 2" >> /etc/fstab;
-    echo "/var/swift2 /srv/node/swift2/ xfs noatime,nodiratime,nobarrier,logbufs=8 0 2" >> /etc/fstab;
-    mount /srv/node/swift1;
-    mount /srv/node/swift2;
-
-- name: edit /etc/default/rsync
-  shell: sed -i 's/RSYNC_ENABLE=false/RSYNC_ENABLE=true/g' /etc/default/rsync
-
-- name: restart rsync service
-  service: name=rsync state=restarted enabled=yes
-
-- name: copy scripts
-  template: src={{ item }} dest=/etc/swift/ backup=yes
-  with_items:
-    - account-server.conf
-    - container-server.conf
-    - object-server.conf
-
-- name: change directory
-  shell: >
-    chown -R swift:swift /srv/node;
-    mkdir -p /var/cache/swift;
-    chown -R root:swift /var/cache/swift;
-    chmod -R 775 /var/cache/swift;
-
-#- name: copy swift lib
-#  copy: src=swift-lib.tar.gz dest=/tmp/swift-lib.tar.gz
-#
-#- name: upload swift lib
-#  unarchive: src=swift-lib.tar.gz dest=/tmp/
-#
-#- name: copy swift lib
-#  shell: command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
-#
-#- name: untar swift lib
-#  shell: >
-#    tar zxf /tmp/swift-lib.tar.gz;
-#    cp /tmp/swift-lib/* /usr/lib/;
-
-- 
cgit 1.2.3-korg