From a88fed3c9ee19f3f67fad5b31ddc9071424dd4ca Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 26 Sep 2014 13:37:27 +1000 Subject: [PATCH] Remove d-i-b tools These are ported into the new repo with change I087a2396581bf4415c9676f70b4c739a62c84b23 Change-Id: I9378cef3555f29857a6869a273b3904c636bb7b0 --- tools/build-dib-in-docker.sh | 16 ---------------- tools/build-image.sh | 28 ---------------------------- tools/mount-image.sh | 25 ------------------------- tools/umount-image.sh | 19 ------------------- 4 files changed, 88 deletions(-) delete mode 100644 tools/build-dib-in-docker.sh delete mode 100755 tools/build-image.sh delete mode 100644 tools/mount-image.sh delete mode 100644 tools/umount-image.sh diff --git a/tools/build-dib-in-docker.sh b/tools/build-dib-in-docker.sh deleted file mode 100644 index 7cfd0a2b81..0000000000 --- a/tools/build-dib-in-docker.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# 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. - -docker.io run --privileged=true -v ~/.cache:/.cache -v $(git rev-parse --show-toplevel):/opt/config -w /opt/config -i -t openstack_infra/ubuntu /bin/bash tools/build-image.sh diff --git a/tools/build-image.sh b/tools/build-image.sh deleted file mode 100755 index 5f67944e9d..0000000000 --- a/tools/build-image.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# 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. - -set -e - -export ELEMENTS_PATH=${ELEMENTS_PATH:-modules/openstack_project/files/nodepool/elements} -export DISTRO=${DISTRO:-ubuntu} -export DIB_RELEASE=${DIB_RELEASE:-trusty} -export DIB_IMAGE_NAME=${DIB_IMAGE_NAME:-${DISTRO}_${DIB_RELEASE}} -export DIB_IMAGE_FILENAME=${DIB_IMAGE_FILENAME:-${DIB_IMAGE_NAME}.qcow} -export NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-modules/openstack_project/files/nodepool/scripts} -export CONFIG_SOURCE=${CONFIG_SOURCE:-file://$(pwd)} -export CONFIG_REF=${CONFIG_REF:-$(git rev-parse HEAD)} - -disk-image-create -x --no-tmpfs -o devstack-gate-$DIB_RELEASE $DISTRO vm openstack-repos puppet nodepool-base node-devstack diff --git a/tools/mount-image.sh b/tools/mount-image.sh deleted file mode 100644 index 4e9e51f9a7..0000000000 --- a/tools/mount-image.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# 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. - -set -e - -IMAGE=$1 - -rm -rf /tmp/newimage -mkdir -p /tmp/newimage - -qemu-nbd -c /dev/nbd1 $1 -mount /dev/nbd1 /tmp/newimage diff --git a/tools/umount-image.sh b/tools/umount-image.sh deleted file mode 100644 index 16ce2769cc..0000000000 --- a/tools/umount-image.sh +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# 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. - -set -e - -umount /tmp/newimage -qemu-nbd -d /dev/nbd1