From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../ansible/roles/storage/files/create_img.sh | 12 ---- .../ansible/roles/storage/files/get_var_size.sh | 14 ----- .../adapters/ansible/roles/storage/files/loop.yml | 10 ---- .../ansible/roles/storage/files/losetup.sh | 15 ----- .../adapters/ansible/roles/storage/files/storage | 10 ---- .../ansible/roles/storage/files/storage.service | 15 ----- .../adapters/ansible/roles/storage/tasks/loop.yml | 31 ---------- .../adapters/ansible/roles/storage/tasks/main.yml | 68 ---------------------- .../adapters/ansible/roles/storage/tasks/real.yml | 16 ----- 9 files changed, 191 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/storage/files/create_img.sh delete mode 100755 deploy/adapters/ansible/roles/storage/files/get_var_size.sh delete mode 100755 deploy/adapters/ansible/roles/storage/files/loop.yml delete mode 100755 deploy/adapters/ansible/roles/storage/files/losetup.sh delete mode 100755 deploy/adapters/ansible/roles/storage/files/storage delete mode 100644 deploy/adapters/ansible/roles/storage/files/storage.service delete mode 100755 deploy/adapters/ansible/roles/storage/tasks/loop.yml delete mode 100755 deploy/adapters/ansible/roles/storage/tasks/main.yml delete mode 100755 deploy/adapters/ansible/roles/storage/tasks/real.yml (limited to 'deploy/adapters/ansible/roles/storage') diff --git a/deploy/adapters/ansible/roles/storage/files/create_img.sh b/deploy/adapters/ansible/roles/storage/files/create_img.sh deleted file mode 100755 index 00392929..00000000 --- a/deploy/adapters/ansible/roles/storage/files/create_img.sh +++ /dev/null @@ -1,12 +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 -############################################################################## -seek_num=`echo $1 | sed -e 's/.* //g'` -if [ ! -f /var/storage.img ]; then - dd if=/dev/zero of=/var/storage.img bs=1 count=0 seek=$seek_num -fi diff --git a/deploy/adapters/ansible/roles/storage/files/get_var_size.sh b/deploy/adapters/ansible/roles/storage/files/get_var_size.sh deleted file mode 100755 index 9d679f97..00000000 --- a/deploy/adapters/ansible/roles/storage/files/get_var_size.sh +++ /dev/null @@ -1,14 +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 -############################################################################## -size=`df /var | awk '$3 ~ /[0-9]+/ { print $4 }'`; -if [ $size -gt 2000000000 ]; then - echo -n 2000000000000; -else - echo -n $((size * 1000 / 512 * 512)); -fi diff --git a/deploy/adapters/ansible/roles/storage/files/loop.yml b/deploy/adapters/ansible/roles/storage/files/loop.yml deleted file mode 100755 index 32088de7..00000000 --- a/deploy/adapters/ansible/roles/storage/files/loop.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 -############################################################################## -physical_device: /dev/loop0 diff --git a/deploy/adapters/ansible/roles/storage/files/losetup.sh b/deploy/adapters/ansible/roles/storage/files/losetup.sh deleted file mode 100755 index 8a22a62a..00000000 --- a/deploy/adapters/ansible/roles/storage/files/losetup.sh +++ /dev/null @@ -1,15 +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 -############################################################################## -loop_dev=`losetup -a |grep "/var/storage.img"|awk -F':' '{print $1}'` -if [ -z $loop_dev ]; then - losetup -f --show /var/storage.img -else - echo $loop_dev -fi - diff --git a/deploy/adapters/ansible/roles/storage/files/storage b/deploy/adapters/ansible/roles/storage/files/storage deleted file mode 100755 index 3acc6115..00000000 --- a/deploy/adapters/ansible/roles/storage/files/storage +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash -### BEGIN INIT INFO -# Provides: Storage -# Required-Start: $remote_fs $network -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: Storage -### END INIT INFO -loop_dev=`sh /opt/setup_storage/losetup.sh` diff --git a/deploy/adapters/ansible/roles/storage/files/storage.service b/deploy/adapters/ansible/roles/storage/files/storage.service deleted file mode 100644 index 924db25a..00000000 --- a/deploy/adapters/ansible/roles/storage/files/storage.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Storage Service -Before=runlevel2.target runlevel3.target runlevel4.target runlevel5.target shutdown.target -After=remote-fs.target nss-lookup.target network-online.target time-sync.target network-online.target net_init.service -Before=ceph.service -Wants=network-online.target -Conflicts=shutdown.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "/etc/init.d/storage" - -[Install] -WantedBy=multi-user.target - diff --git a/deploy/adapters/ansible/roles/storage/tasks/loop.yml b/deploy/adapters/ansible/roles/storage/tasks/loop.yml deleted file mode 100755 index b0fb9c21..00000000 --- a/deploy/adapters/ansible/roles/storage/tasks/loop.yml +++ /dev/null @@ -1,31 +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 available /var partition size - script: get_var_size.sh - register: part_size - -- name: create image file if not exitst - script: create_img.sh "{{ part_size.stdout }}" - -- name: do a losetup on storage volumes - script: losetup.sh - register: loop_device - -- name: debug loop device - debug: msg={{ loop_device.stdout }} - -- name: get device - shell: echo '{{ loop_device.stdout }}' | sed ':a;N;$!ba;s/.*\n\(\/dev\)/\1/g' - register: loop_device_filterd - -- name: create physical and group volumes - lvg: vg=storage-volumes pvs={{ loop_device_filterd.stdout }} - vg_options=--force diff --git a/deploy/adapters/ansible/roles/storage/tasks/main.yml b/deploy/adapters/ansible/roles/storage/tasks/main.yml deleted file mode 100755 index b054be9e..00000000 --- a/deploy/adapters/ansible/roles/storage/tasks/main.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: check if physical device exists - stat: path={{ physical_device }} - register: status - tags: - - storage - -- name: load loop.yml - include: loop.yml - when: status.stat.exists == False or status.stat.isblk == False - tags: - - storage - -- name: load real.yml - include: real.yml - when: status.stat.exists == True and status.stat.isblk == True - tags: - - storage - -- name: make setup_storage directory - file: path=/opt/setup_storage state=directory mode=0755 - tags: - - storage - -- name: copy setup storage scripts - copy: src={{ item }} dest=/opt/setup_storage mode=0755 - with_items: - - losetup.sh - tags: - - storage - -- name: set autostart file - copy: src=storage dest=/etc/init.d/storage mode=0755 - tags: - - storage - -- name: set autostart file for centos - copy: - src: storage.service - dest: /usr/lib/systemd/system/storage.service - mode: 0755 - when: ansible_os_family == "RedHat" - tags: - - storage - -- name: add to boot scripts - shell: update-rc.d storage defaults - when: ansible_os_family == "Debian" - tags: - - storage - -- name: add to boot scripts - shell: | - chkconfig --add storage; - chkconfig --level 2345 storage on; - when: ansible_os_family == 'RedHat' - tags: - - storage - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/storage/tasks/real.yml b/deploy/adapters/ansible/roles/storage/tasks/real.yml deleted file mode 100755 index 7845a235..00000000 --- a/deploy/adapters/ansible/roles/storage/tasks/real.yml +++ /dev/null @@ -1,16 +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: destroy GPT lable - shell: dd if=/dev/urandom of={{ physical_device }} bs=4M count=1 - ignore_errors: "True" - -- name: create physical and group volumes - lvg: vg=storage-volumes pvs={{ physical_device }} - vg_options=--force -- cgit 1.2.3-korg