(promenade) Support genesis on 18.04
- Cleanup the genesis.sh template to support Ubuntu Bionic Change-Id: I33d4731bbadfc3ec54b43606184a40d7597e9831
This commit is contained in:
parent
b77002339c
commit
b037267203
|
@ -45,6 +45,11 @@
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: ubuntu-xenial
|
label: ubuntu-xenial
|
||||||
|
- nodeset:
|
||||||
|
name: airship-promenade-single-node-bionic
|
||||||
|
nodes:
|
||||||
|
- name: primary
|
||||||
|
label: ubuntu-bionic
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-promenade-genesis-gate
|
name: airship-promenade-genesis-gate
|
||||||
|
@ -52,7 +57,7 @@
|
||||||
Deploy airship promenade genesis
|
Deploy airship promenade genesis
|
||||||
run: tools/zuul/playbooks/deploy-promenade.yaml
|
run: tools/zuul/playbooks/deploy-promenade.yaml
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
nodeset: airship-promenade-single-node
|
nodeset: airship-promenade-single-node-bionic
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-promenade-lint-ws
|
name: airship-promenade-lint-ws
|
||||||
|
|
|
@ -84,7 +84,7 @@ class GPGEncryptionMethod(EncryptionMethod):
|
||||||
'''
|
'''
|
||||||
|
|
||||||
def get_decrypt_command(self):
|
def get_decrypt_command(self):
|
||||||
return ('/usr/bin/gpg --verbose --decrypt '
|
return ('/usr/bin/gpg --verbose --decrypt --batch '
|
||||||
'--passphrase "${DECRYPTION_KEY}"')
|
'--passphrase "${DECRYPTION_KEY}"')
|
||||||
|
|
||||||
def get_decrypt_teardown_command(self):
|
def get_decrypt_teardown_command(self):
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
# Disable overwriting our resolv.conf
|
# 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=(
|
CURATED_DIRS=(
|
||||||
/etc/kubernetes
|
/etc/kubernetes
|
||||||
|
|
Loading…
Reference in New Issue