From: Mark McLoughlin <markmc@redhat.com>
Date: Tue, 17 Jul 2012 03:33:17 +0000 (+0100)
Subject: Remove some unused helper scripts
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8b6397bbf58a6c0da00500407790ed8547741771;p=openstack-build%2Fcinder-build.git

Remove some unused helper scripts

openstack-config init script and clean-vlans scripts are only relevant
to nova.

Change-Id: Ib139cae1e0f157f69f7d9ae7186c555538e4b1f5
---

diff --git a/contrib/openstack-config b/contrib/openstack-config
deleted file mode 100755
index d7979f7ff..000000000
--- a/contrib/openstack-config
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          openstack
-# Required-Start:    mountkernfs $local_fs
-# Required-Stop:     $local_fs
-# X-Start-Before:    networking
-# Should-Start:
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Apply configuration from OpenStack Config Drive
-### END INIT INFO
-
-PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
-
-. /lib/lsb/init-functions
-
-copy_cloud_config() {
-  LABEL="config"
-  if [ ! -e /dev/disk/by-label/${LABEL} ]; then
-    log_warning_msg "OpenStack Cloud Config drive not found"
-    return 1
-  fi
-
-  MNT=/tmp/config
-  mkdir -p ${MNT}
-  mount /dev/disk/by-label/${LABEL} ${MNT}
-  if [ -e ${MNT}/root/.ssh/authorized_keys ]; then
-    mkdir -m 700 -p /root/.ssh/
-    cp ${MNT}/root/.ssh/authorized_keys /root/.ssh/
-    chmod 600 ${MNT}/root/.ssh/authorized_keys
-  fi
-  if [ -e ${MNT}/etc/network/interfaces ]; then
-    cp ${MNT}/etc/network/interfaces /etc/network/
-    chmod 644 /etc/network/interfaces
-  fi
-  umount ${MNT}
-  return 0
-}
-
-case "$1" in
-  start|"")
-    log_action_begin_msg "Applying OpenStack Cloud Config"
-    if copy_cloud_config; then
-      log_action_end_msg $?
-    else
-      log_action_end_msg $?
-    fi
-  ;;
-
-  restart|reload|force-reload|status)
-    echo "Error: argument '$1' not supported" >&2
-    exit 3
-  ;;
-
-  stop)
-    # No-op
-  ;;
-
-  *)
-    echo "Usage: openstack.sh [start|stop]" >&2
-    exit 3
-  ;;
-esac
-
-:
diff --git a/tools/clean-vlans b/tools/clean-vlans
deleted file mode 100755
index 284e5dc57..000000000
--- a/tools/clean-vlans
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-export LC_ALL=C
-
-sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
-sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo
-sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
-sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ip link del foo