diff --git a/nodepool/elements/stackviz/README.rst b/nodepool/elements/stackviz/README.rst deleted file mode 100644 index 57f3506871..0000000000 --- a/nodepool/elements/stackviz/README.rst +++ /dev/null @@ -1 +0,0 @@ -Installs stackviz and builds npm dependencies for eventual transfer to the logs server. diff --git a/nodepool/elements/stackviz/cleanup.d/50-npm b/nodepool/elements/stackviz/cleanup.d/50-npm deleted file mode 100755 index 3593aa4988..0000000000 --- a/nodepool/elements/stackviz/cleanup.d/50-npm +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 Red Hat, Inc. -# -# 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. -# -if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -sudo rm -rf $TARGET_ROOT/root/.npm diff --git a/nodepool/elements/stackviz/install.d/89-prepare-stackviz b/nodepool/elements/stackviz/install.d/89-prepare-stackviz deleted file mode 100755 index 0d00b2a552..0000000000 --- a/nodepool/elements/stackviz/install.d/89-prepare-stackviz +++ /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. - -# dib-lint: disable=setu setpipefail sete -if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then - set -x -fi - -STACKVIZ_NPM_TIMEOUT="15m" -STACKVIZ_DIR=/opt/stackviz -cp -r /opt/git/openstack/stackviz $STACKVIZ_DIR - -cd $STACKVIZ_DIR - -timeout $STACKVIZ_NPM_TIMEOUT npm install -ret=$? - -if [[ $ret -eq 0 ]]; then - npm run prod && rm -rf node_modules/ -else - echo "stackviz build aborted due to npm error" - rm -rf $STACKVIZ_DIR -fi - -exit 0 diff --git a/nodepool/elements/stackviz/package-installs.yaml b/nodepool/elements/stackviz/package-installs.yaml deleted file mode 100644 index 632c547558..0000000000 --- a/nodepool/elements/stackviz/package-installs.yaml +++ /dev/null @@ -1,2 +0,0 @@ -nodejs: -npm: diff --git a/nodepool/elements/stackviz/pkg-map b/nodepool/elements/stackviz/pkg-map deleted file mode 100644 index 555ca5332e..0000000000 --- a/nodepool/elements/stackviz/pkg-map +++ /dev/null @@ -1,28 +0,0 @@ -{ - "release": { - "fedora": { - "24": { - "npm": "" - } - }, - "opensuse": { - "42.2": { - "nodejs": "nodejs4", - "npm": "npm4" - } - } - }, - "family": { - "debian": { - "nodejs": "nodejs-legacy" - }, - "suse": { - "nodejs": "nodejs6", - "npm": "npm6" - } - }, - "default": { - "nodejs": "nodejs", - "npm": "npm" - } -} diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 965aa3f88b..12c8c12fe4 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -1192,7 +1192,6 @@ diskimages: - cache-devstack - growroot - infra-package-needs - - stackviz release: jessie env-vars: TMPDIR: /opt/dib_tmp @@ -1212,7 +1211,6 @@ diskimages: - cache-devstack - growroot - infra-package-needs - - stackviz release: trusty env-vars: TMPDIR: /opt/dib_tmp @@ -1233,7 +1231,6 @@ diskimages: - initialize-urandom - growroot - infra-package-needs - - stackviz release: xenial env-vars: TMPDIR: /opt/dib_tmp @@ -1272,7 +1269,6 @@ diskimages: - initialize-urandom - growroot - infra-package-needs - - stackviz release: 25 env-vars: TMPDIR: /opt/dib_tmp @@ -1290,7 +1286,6 @@ diskimages: - cache-devstack - growroot - infra-package-needs - - stackviz release: '42.2' env-vars: TMPDIR: /opt/dib_tmp diff --git a/nodepool/nodepoolv3.yaml b/nodepool/nodepoolv3.yaml index ef0f607e7c..6abd9e5b70 100644 --- a/nodepool/nodepoolv3.yaml +++ b/nodepool/nodepoolv3.yaml @@ -62,7 +62,6 @@ diskimages: - initialize-urandom - growroot - infra-package-needs - - stackviz release: xenial env-vars: TMPDIR: /opt/dib_tmp