Switch to fedora-27 for nodepool dsvm
Fedora-27 is the latest supported version, switch to it. We also have fedora-27 DIBs live in openstack-infra. Change-Id: Iff9e01a8aab4ba50c42e5e72fabbe8cb20bc821c Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
230c4ff792
commit
c857a38650
|
@ -85,7 +85,7 @@
|
|||
vars:
|
||||
devstack_localrc:
|
||||
NODEPOOL_PAUSE_CENTOS_7_DIB: false
|
||||
NODEPOOL_PAUSE_FEDORA_26_DIB: false
|
||||
NODEPOOL_PAUSE_FEDORA_27_DIB: false
|
||||
|
||||
- job:
|
||||
name: nodepool-functional-py35-suse-src
|
||||
|
|
|
@ -199,7 +199,7 @@ EOF
|
|||
|
||||
NODEPOOL_CENTOS_7_MIN_READY=1
|
||||
NODEPOOL_DEBIAN_JESSIE_MIN_READY=1
|
||||
NODEPOOL_FEDORA_26_MIN_READY=1
|
||||
NODEPOOL_FEDORA_27_MIN_READY=1
|
||||
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=1
|
||||
NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
|
||||
NODEPOOL_OPENSUSE_423_MIN_READY=1
|
||||
|
@ -210,8 +210,8 @@ EOF
|
|||
if $NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB ; then
|
||||
NODEPOOL_DEBIAN_JESSIE_MIN_READY=0
|
||||
fi
|
||||
if $NODEPOOL_PAUSE_FEDORA_26_DIB ; then
|
||||
NODEPOOL_FEDORA_26_MIN_READY=0
|
||||
if $NODEPOOL_PAUSE_FEDORA_27_DIB ; then
|
||||
NODEPOOL_FEDORA_27_MIN_READY=0
|
||||
fi
|
||||
if $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB ; then
|
||||
NODEPOOL_UBUNTU_TRUSTY_MIN_READY=0
|
||||
|
@ -239,8 +239,8 @@ labels:
|
|||
min-ready: $NODEPOOL_CENTOS_7_MIN_READY
|
||||
- name: debian-jessie
|
||||
min-ready: $NODEPOOL_DEBIAN_JESSIE_MIN_READY
|
||||
- name: fedora-26
|
||||
min-ready: $NODEPOOL_FEDORA_26_MIN_READY
|
||||
- name: fedora-27
|
||||
min-ready: $NODEPOOL_FEDORA_27_MIN_READY
|
||||
- name: ubuntu-trusty
|
||||
min-ready: $NODEPOOL_UBUNTU_TRUSTY_MIN_READY
|
||||
- name: ubuntu-xenial
|
||||
|
@ -261,7 +261,7 @@ providers:
|
|||
config-drive: true
|
||||
- name: debian-jessie
|
||||
config-drive: true
|
||||
- name: fedora-26
|
||||
- name: fedora-27
|
||||
config-drive: true
|
||||
- name: ubuntu-trusty
|
||||
config-drive: true
|
||||
|
@ -283,8 +283,8 @@ providers:
|
|||
min-ram: 512
|
||||
flavor-name: 'nodepool'
|
||||
console-log: True
|
||||
- name: fedora-26
|
||||
diskimage: fedora-26
|
||||
- name: fedora-27
|
||||
diskimage: fedora-27
|
||||
min-ram: 1024
|
||||
flavor-name: 'nodepool'
|
||||
console-log: True
|
||||
|
@ -351,8 +351,8 @@ diskimages:
|
|||
$DIB_GLEAN_INSTALLTYPE
|
||||
$DIB_GLEAN_REPOLOCATION
|
||||
$DIB_GLEAN_REPOREF
|
||||
- name: fedora-26
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_26_DIB
|
||||
- name: fedora-27
|
||||
pause: $NODEPOOL_PAUSE_FEDORA_27_DIB
|
||||
rebuild-age: 86400
|
||||
elements:
|
||||
- fedora-minimal
|
||||
|
@ -361,7 +361,7 @@ diskimages:
|
|||
- devuser
|
||||
- openssh-server
|
||||
- nodepool-setup
|
||||
release: 26
|
||||
release: 27
|
||||
env-vars:
|
||||
TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
|
||||
DIB_CHECKSUM: '1'
|
||||
|
|
|
@ -8,7 +8,7 @@ NODEPOOL_DIB_BASE_PATH=/opt/dib
|
|||
# change the defaults.
|
||||
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_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_DIB:-true}
|
||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_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_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}
|
||||
|
|
|
@ -24,7 +24,7 @@ else
|
|||
fi
|
||||
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_26_DIB=${NODEPOOL_PAUSE_FEDORA_26_DIB:-True}
|
||||
NODEPOOL_PAUSE_FEDORA_27_DIB=${NODEPOOL_PAUSE_FEDORA_27_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_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-True}
|
||||
|
@ -65,11 +65,11 @@ if [ ${NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB,,} = 'false' ]; then
|
|||
waitfornode debian-jessie
|
||||
fi
|
||||
|
||||
if [ ${NODEPOOL_PAUSE_FEDORA_26_DIB,,} = 'false' ]; then
|
||||
if [ ${NODEPOOL_PAUSE_FEDORA_27_DIB,,} = 'false' ]; then
|
||||
# check that image built
|
||||
waitforimage fedora-26
|
||||
waitforimage fedora-27
|
||||
# check image was bootable
|
||||
waitfornode fedora-26
|
||||
waitfornode fedora-27
|
||||
fi
|
||||
|
||||
if [ ${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB,,} = 'false' ]; then
|
||||
|
|
Loading…
Reference in New Issue