(promenade) Support genesis on 18.04

- Cleanup the genesis.sh template to support Ubuntu Bionic

Change-Id: I33d4731bbadfc3ec54b43606184a40d7597e9831
This commit is contained in:
Scott Hussey 2019-09-30 16:37:42 -05:00
parent b77002339c
commit b037267203
3 changed files with 11 additions and 3 deletions

View File

@ -45,6 +45,11 @@
nodes:
- name: primary
label: ubuntu-xenial
- nodeset:
name: airship-promenade-single-node-bionic
nodes:
- name: primary
label: ubuntu-bionic
- job:
name: airship-promenade-genesis-gate
@ -52,7 +57,7 @@
Deploy airship promenade genesis
run: tools/zuul/playbooks/deploy-promenade.yaml
timeout: 3600
nodeset: airship-promenade-single-node
nodeset: airship-promenade-single-node-bionic
- job:
name: airship-promenade-lint-ws

View File

@ -84,7 +84,7 @@ class GPGEncryptionMethod(EncryptionMethod):
'''
def get_decrypt_command(self):
return ('/usr/bin/gpg --verbose --decrypt '
return ('/usr/bin/gpg --verbose --decrypt --batch '
'--passphrase "${DECRYPTION_KEY}"')
def get_decrypt_teardown_command(self):

View File

@ -1,6 +1,9 @@
# Disable overwriting our resolv.conf
#
resolvconf --disable-updates
if [ -h /etc/resolv.conf ]; then
log "=== Removing resolv.conf symlink ==="
rm -f /etc/resolv.conf
fi
CURATED_DIRS=(
/etc/kubernetes