diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 863866032..9d3fe0d85 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -201,7 +201,6 @@ EOF NODEPOOL_CENTOS_7_MIN_READY=1 NODEPOOL_DEBIAN_JESSIE_MIN_READY=1 NODEPOOL_FEDORA_25_MIN_READY=1 - NODEPOOL_UBUNTU_PRECISE_MIN_READY=1 NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1 NODEPOOL_UBUNTU_XENIAL_MIN_READY=1 @@ -214,9 +213,6 @@ EOF if $NODEPOOL_PAUSE_FEDORA_25_DIB ; then NODEPOOL_FEDORA_25_MIN_READY=0 fi - if $NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB ; then - NODEPOOL_UBUNTU_PRECISE_MIN_READY=0 - fi if $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB ; then NODEPOOL_UBUNTU_TRUSTY_MIN_READY=0 fi @@ -242,8 +238,6 @@ labels: min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY - name: fedora-25 min-ready: $NODEPOOL_FEDORA_25_MIN_READY - - name: ubuntu-precise - min-ready: $NODEPOOL_UBUNTU_PRECISE_MIN_READY - name: ubuntu-trusty min-ready: $NODEPOOL_UBUNTU_TRUSTY_MIN_READY - name: ubuntu-xenial @@ -264,8 +258,6 @@ providers: config-drive: true - name: fedora-25 config-drive: true - - name: ubuntu-precise - config-drive: true - name: ubuntu-trusty config-drive: true - name: ubuntu-xenial @@ -289,11 +281,6 @@ providers: min-ram: 1024 flavor-name: 'nodepool' console-log: True - - name: ubuntu-precise - diskimage: ubuntu-precise - min-ram: 512 - flavor-name: 'nodepool' - console-log: True - name: ubuntu-trusty diskimage: ubuntu-trusty min-ram: 512 @@ -371,29 +358,6 @@ diskimages: $DIB_GLEAN_INSTALLTYPE $DIB_GLEAN_REPOLOCATION $DIB_GLEAN_REPOREF - - name: ubuntu-precise - pause: $NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB - rebuild-age: 86400 - elements: - - ubuntu-minimal - - vm - - simple-init - - devuser - - openssh-server - - nodepool-setup - release: precise - env-vars: - TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp - DIB_CHECKSUM: '1' - DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY - DIB_DEBIAN_COMPONENTS: 'main,universe' - $DIB_GET_PIP - $DIB_GLEAN_INSTALLTYPE - $DIB_GLEAN_REPOLOCATION - $DIB_GLEAN_REPOREF - name: ubuntu-trusty pause: $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB rebuild-age: 86400 diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh index bd44246ab..528adaf64 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -11,7 +11,6 @@ NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true} NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true} NODEPOOL_PAUSE_FEDORA_25_DIB=${NODEPOOL_PAUSE_FEDORA_25_DIB:-true} -NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=${NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB:-true} NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-false} NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true} @@ -62,13 +61,6 @@ if [ $NODEPOOL_PAUSE_FEDORA_25_DIB = 'false' ]; then waitfornode fedora-25 fi -if [ $NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB = 'false' ]; then - # check that image built - waitforimage ubuntu-precise - # check image was bootable - waitfornode ubuntu-precise -fi - if [ $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB = 'false' ]; then # check that image built waitforimage ubuntu-trusty