Andrew Bogott has submitted this change and it was merged.
Change subject: nodepool: stop using diskimage
..
nodepool: stop using diskimage
Diskimage is yet another image creation tool and we probably have
enough. Moreover Nodepool would require root access on the machine to
rebuild image periodically (T102281).
Stop using diskimage-builder
Switch to `base-image` which instructs Nodepool to use the given image
name provided by the cloud provider (wmflabs)
Change image name from ci-dib-jessie-wikimedia to ci-jessie-wikimedia
RelEng will build and upload the image manually for now.
Bug: T102281
Change-Id: I27fb0bf5843bfad53ba610da948bc4935f0391df
---
D modules/nodepool/files/elements/nodepool-base/README.rst
D modules/nodepool/files/elements/nodepool-base/element-deps
D
modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
D modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
D modules/nodepool/files/elements/nodepool-base/install.d/05-record-details
D modules/nodepool/files/elements/nodepool-base/install.d/package-installs-java
D modules/nodepool/files/elements/wikimedia-networking/element-deps
D
modules/nodepool/files/elements/wikimedia-networking/install.d/package-installs-dhcp-client
D
modules/nodepool/files/elements/wikimedia-networking/install.d/package-installs-net-tools
M modules/nodepool/manifests/init.pp
M modules/nodepool/templates/nodepool.yaml.erb
11 files changed, 6 insertions(+), 135 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nodepool/files/elements/nodepool-base/README.rst
b/modules/nodepool/files/elements/nodepool-base/README.rst
deleted file mode 100644
index 75ee300..000
--- a/modules/nodepool/files/elements/nodepool-base/README.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-nodepool-base
--
-
-NodePool element to prepare an image to be connected with Jenkins.
diff --git a/modules/nodepool/files/elements/nodepool-base/element-deps
b/modules/nodepool/files/elements/nodepool-base/element-deps
deleted file mode 100644
index 7076aba..000
--- a/modules/nodepool/files/elements/nodepool-base/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-package-installs
diff --git
a/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
b/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
deleted file mode 100755
index e1ce4bb..000
---
a/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
+++ /dev/null
@@ -1,39 +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.
-
-# Copy the nodepools scripts into the image
-
-# This is 99 because it needs to depend on source-repositories having been
-# run, because the default fallthrough location for the nodepool scripts
-# is the git repo that's been cloned into the image.
-
-# During a nodepool run, it's expected that NODEPOOL_SCRIPTDIR is set, in
-# which case ordering doesn't matter - but for a developer hacking locally
-# who is not hacking on those scripts, it's an imposition to make them
-# set an env var.
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-set -x
-fi
-set -eu
-set -o pipefail
-
-NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack-infra/project-config/nodepool/scripts}
-
-sudo cp -a $NODEPOOL_SCRIPTDIR $TMP_MOUNT_PATH/opt/nodepool-scripts
-sudo chmod -R a+rx $TMP_MOUNT_PATH/opt/nodepool-scripts
diff --git
a/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
b/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
deleted file mode 100755
index 7e36a2d..000
--- a/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# 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
