Merge "Support ubuntu-bionic (18.04) with nodepool dsvm"
This commit is contained in:
commit
95bf1332d2
@ -103,6 +103,7 @@
|
|||||||
parent: nodepool-functional-py35-src-base
|
parent: nodepool-functional-py35-src-base
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
|
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB: false
|
||||||
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB: false
|
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB: false
|
||||||
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB: false
|
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB: false
|
||||||
|
|
||||||
|
@ -208,6 +208,7 @@ EOF
|
|||||||
NODEPOOL_CENTOS_7_MIN_READY=1
|
NODEPOOL_CENTOS_7_MIN_READY=1
|
||||||
NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
|
NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
|
||||||
NODEPOOL_FEDORA_27_MIN_READY=1
|
NODEPOOL_FEDORA_27_MIN_READY=1
|
||||||
|
NODEPOOL_UBUNTU_BIONIC_MIN_READY=1
|
||||||
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
|
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
|
||||||
NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
|
NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
|
||||||
NODEPOOL_OPENSUSE_423_MIN_READY=1
|
NODEPOOL_OPENSUSE_423_MIN_READY=1
|
||||||
@ -222,6 +223,9 @@ EOF
|
|||||||
if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
|
if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
|
||||||
NODEPOOL_FEDORA_27_MIN_READY=0
|
NODEPOOL_FEDORA_27_MIN_READY=0
|
||||||
fi
|
fi
|
||||||
|
if $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB ; then
|
||||||
|
NODEPOOL_UBUNTU_BIONIC_MIN_READY=0
|
||||||
|
fi
|
||||||
if $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB ; then
|
if $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB ; then
|
||||||
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=0
|
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=0
|
||||||
fi
|
fi
|
||||||
@ -253,6 +257,8 @@ labels:
|
|||||||
min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
|
min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
|
||||||
- name: fedora-27
|
- name: fedora-27
|
||||||
min-ready: $NODEPOOL_FEDORA_27_MIN_READY
|
min-ready: $NODEPOOL_FEDORA_27_MIN_READY
|
||||||
|
- name: ubuntu-bionic
|
||||||
|
min-ready: $NODEPOOL_UBUNTU_BIONIC_MIN_READY
|
||||||
- name: ubuntu-trusty
|
- name: ubuntu-trusty
|
||||||
min-ready: $NODEPOOL_UBUNTU_TRUSTY_MIN_READY
|
min-ready: $NODEPOOL_UBUNTU_TRUSTY_MIN_READY
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
@ -277,6 +283,8 @@ providers:
|
|||||||
config-drive: true
|
config-drive: true
|
||||||
- name: fedora-27
|
- name: fedora-27
|
||||||
config-drive: true
|
config-drive: true
|
||||||
|
- name: ubuntu-bionic
|
||||||
|
config-drive: true
|
||||||
- name: ubuntu-trusty
|
- name: ubuntu-trusty
|
||||||
config-drive: true
|
config-drive: true
|
||||||
- name: ubuntu-xenial
|
- name: ubuntu-xenial
|
||||||
@ -307,6 +315,12 @@ providers:
|
|||||||
flavor-name: 'nodepool'
|
flavor-name: 'nodepool'
|
||||||
console-log: True
|
console-log: True
|
||||||
key-name: $NODEPOOL_KEY_NAME
|
key-name: $NODEPOOL_KEY_NAME
|
||||||
|
- name: ubuntu-bionic
|
||||||
|
diskimage: ubuntu-bionic
|
||||||
|
min-ram: 512
|
||||||
|
flavor-name: 'nodepool'
|
||||||
|
console-log: True
|
||||||
|
key-name: $NODEPOOL_KEY_NAME
|
||||||
- name: ubuntu-trusty
|
- name: ubuntu-trusty
|
||||||
diskimage: ubuntu-trusty
|
diskimage: ubuntu-trusty
|
||||||
min-ram: 512
|
min-ram: 512
|
||||||
@ -398,6 +412,34 @@ diskimages:
|
|||||||
$DIB_GLEAN_INSTALLTYPE
|
$DIB_GLEAN_INSTALLTYPE
|
||||||
$DIB_GLEAN_REPOLOCATION
|
$DIB_GLEAN_REPOLOCATION
|
||||||
$DIB_GLEAN_REPOREF
|
$DIB_GLEAN_REPOREF
|
||||||
|
- name: ubuntu-bionic
|
||||||
|
pause: $NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB
|
||||||
|
rebuild-age: 86400
|
||||||
|
elements:
|
||||||
|
- ubuntu-minimal
|
||||||
|
- vm
|
||||||
|
- simple-init
|
||||||
|
- devuser
|
||||||
|
- openssh-server
|
||||||
|
- nodepool-setup
|
||||||
|
release: bionic
|
||||||
|
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'
|
||||||
|
# NOTE(pabelanger): Due to an issue with reprepro and empty repo, we
|
||||||
|
# cannot use AFS mirrors until bionic-updates / bionic-backports actually
|
||||||
|
# have packages.
|
||||||
|
#$DIB_DISTRIBUTION_MIRROR_UBUNTU
|
||||||
|
#$DIB_DEBOOTSTRAP_EXTRA_ARGS
|
||||||
|
$DIB_GET_PIP
|
||||||
|
$DIB_GLEAN_INSTALLTYPE
|
||||||
|
$DIB_GLEAN_REPOLOCATION
|
||||||
|
$DIB_GLEAN_REPOREF
|
||||||
- name: ubuntu-trusty
|
- name: ubuntu-trusty
|
||||||
pause: $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB
|
pause: $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB
|
||||||
rebuild-age: 86400
|
rebuild-age: 86400
|
||||||
|
@ -9,6 +9,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
|
|||||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
|
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-true}
|
||||||
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true}
|
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-true}
|
||||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
|
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-true}
|
||||||
|
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-true}
|
||||||
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
|
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
|
||||||
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
|
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
|
||||||
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}
|
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}
|
||||||
|
@ -18,6 +18,7 @@ fi
|
|||||||
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
|
NODEPOOL_PAUSE_CENTOS_7_DIB=${NODEPOOL_PAUSE_CENTOS_7_DIB:-True}
|
||||||
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-True}
|
NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB:-True}
|
||||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
|
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_DIB:-True}
|
||||||
|
NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB=${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB:-True}
|
||||||
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
|
NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
|
||||||
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
|
NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
|
||||||
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-True}
|
NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-True}
|
||||||
@ -80,6 +81,15 @@ if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then
|
|||||||
sshintonode fedora-27
|
sshintonode fedora-27
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${NODEPOOL_PAUSE_UBUNTU_BIONIC_DIB,,} = 'false' ]; then
|
||||||
|
# check that image built
|
||||||
|
waitforimage ubuntu-bionic
|
||||||
|
# check image was bootable
|
||||||
|
waitfornode ubuntu-bionic
|
||||||
|
# check ssh for root user
|
||||||
|
sshintonode ubuntu-bionic
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB,,} = 'false' ]; then
|
if [ ${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB,,} = 'false' ]; then
|
||||||
# check that image built
|
# check that image built
|
||||||
waitforimage ubuntu-trusty
|
waitforimage ubuntu-trusty
|
||||||
|
Loading…
Reference in New Issue
Block a user