Merge "Add support for NTP in gate-multinode"

This commit is contained in:
Zuul 2019-02-19 16:10:59 +00:00 committed by Gerrit Code Review
commit 683dfc8190
3 changed files with 8 additions and 0 deletions

View File

@ -17,6 +17,8 @@ export VIRSH_POOL=${VIRSH_POOL:-airship}
export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host}
export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"}
export NTP_POOLS=${NTP_POOLS:-"0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org"}
export NTP_SERVERS=${NTP_SERVERS:-""}
export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-'password18'}
export AIRSHIP_KEYSTONE_URL=${AIRSHIP_KEYSTONE_URL:-'http://keystone.gate.local:80/v3'}

View File

@ -42,6 +42,8 @@ iso_gen() {
export BR_IP_NODE
export NAME
export SSH_PUBLIC_KEY
export NTP_POOLS=$(join_array ',' $NTP_POOLS)
export NTP_SERVERS=$(join_array ',' $NTP_SERVERS)
envsubst < "${TEMPLATE_DIR}/user-data.sub" > user-data
if [[ ! -z "${ADDL_USERDATA}" ]]

View File

@ -14,3 +14,7 @@ chpasswd:
list: |
root:password
expire: false
ntp:
pools: [${NTP_POOLS}]
servers: [${NTP_SERVERS}]