Merge "Fix build-image.sh example comments"

This commit is contained in:
Jenkins
2017-04-11 08:49:39 +00:00
committed by Gerrit Code Review

View File

@@ -54,8 +54,8 @@ fi
## If your firewall won't allow outbound DNS connections, you'll want ## If your firewall won't allow outbound DNS connections, you'll want
## to set these to local resolvers ## to set these to local resolvers
# NODEPOOL_STATIC_NAMESERVER_V4=192.168.0.1 # export NODEPOOL_STATIC_NAMESERVER_V4=192.168.0.1
# NODEPOOL_STATIC_NAMESERVER_V6=2000::... # export NODEPOOL_STATIC_NAMESERVER_V6=2000::...
## This will get dib to drop you into a shell on error, useful for debugging ## This will get dib to drop you into a shell on error, useful for debugging
# export break="after-error" # export break="after-error"
@@ -85,12 +85,12 @@ fi
## password. ## password.
## defaults ## defaults
## DIB_DEV_USER_USERNAME=devuser ## export DIB_DEV_USER_USERNAME=devuser
## DIB_DEV_USER_AUTHORIZED_KEYS=$HOME/.ssh/id_rsa.pub ## export DIB_DEV_USER_AUTHORIZED_KEYS=$HOME/.ssh/id_rsa.pub
# EXTRA_ELEMENTS+=devuser # EXTRA_ELEMENTS+=devuser
# DIB_DEV_USER_PWDLESS_SUDO=1 # export DIB_DEV_USER_PWDLESS_SUDO=1
# DIB_DEV_USER_PASSWORD=devuser # export DIB_DEV_USER_PASSWORD=devuser
## The list of elements below should match those configured ## The list of elements below should match those configured
## in nodepool/nodepool.yaml ## in nodepool/nodepool.yaml