diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f8fbe68f4..2bd4b76a1 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -256,11 +256,6 @@ labels: min-ready: 1 providers: - name: devstack - - name: ubuntu-precise - image: ubuntu-precise - min-ready: 1 - providers: - - name: devstack - name: ubuntu-trusty image: ubuntu-trusty min-ready: 1 @@ -307,12 +302,6 @@ providers: username: devuser private-key: $NODEPOOL_KEY config-drive: true - - name: ubuntu-precise - min-ram: 512 - name-filter: 'nodepool' - username: devuser - private-key: $NODEPOOL_KEY - config-drive: true - name: ubuntu-trusty min-ram: 512 name-filter: 'nodepool' @@ -412,29 +401,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/devstack/settings b/devstack/settings index 8b504a54c..505b55adf 100644 --- a/devstack/settings +++ b/devstack/settings @@ -10,7 +10,6 @@ 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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_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} diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh index 0093d08d2..04c08b617 100755 --- a/tools/check_devstack_plugin.sh +++ b/tools/check_devstack_plugin.sh @@ -12,7 +12,6 @@ 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_OPENSUSE_42_2_DIB=${NODEPOOL_PAUSE_OPENSUSE_42_2_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} @@ -70,13 +69,6 @@ if [ $NODEPOOL_PAUSE_OPENSUSE_42_2_DIB = 'false' ]; then waitfornode opensuse-42.2 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