-
Notifications
You must be signed in to change notification settings - Fork 325
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(node): Configuration revamp (HostOS integration) #3390
Open
andrewbattat
wants to merge
5
commits into
master
Choose a base branch
from
andrew/hostos-config-revamp
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+382
−697
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
ic-os/components/early-boot/setup-hostname/guestos/setup-hostname.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -ex | ||
|
|
||
| # Read the network config variables from file. The file must be of the form | ||
| # "key=value" for each line with a specific set of keys permissible (see | ||
| # code below). | ||
| # | ||
| # Arguments: | ||
| # - $1: Name of the file to be read. | ||
| function read_variables() { | ||
| # Read limited set of keys. Be extra-careful quoting values as it could | ||
| # otherwise lead to executing arbitrary shell code! | ||
| while IFS="=" read -r key value; do | ||
| case "$key" in | ||
| "hostname") hostname="${value}" ;; | ||
| esac | ||
| done <"$1" | ||
| } | ||
|
|
||
| if [ -e /boot/config/network.conf ]; then | ||
| cat /boot/config/network.conf | ||
| read_variables /boot/config/network.conf | ||
| hostname="${hostname:-blank}" | ||
| else | ||
| hostname="unnamed" | ||
| fi | ||
|
|
||
| echo "${hostname}" >/run/ic-node/etc/hostname | ||
| mount --bind /run/ic-node/etc/hostname /etc/hostname | ||
| restorecon -v /etc/hostname | ||
| hostname "${hostname}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 0 additions & 108 deletions
108
ic-os/components/early-boot/setup-hostname/hostos/setup-hostname.sh
This file was deleted.
Oops, something went wrong.
122 changes: 94 additions & 28 deletions
122
ic-os/components/early-boot/setup-hostname/setup-hostname.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,98 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -ex | ||
|
|
||
| # Read the network config variables from file. The file must be of the form | ||
| # "key=value" for each line with a specific set of keys permissible (see | ||
| # code below). | ||
| # | ||
| # Arguments: | ||
| # - $1: Name of the file to be read. | ||
| function read_variables() { | ||
| # Read limited set of keys. Be extra-careful quoting values as it could | ||
| # otherwise lead to executing arbitrary shell code! | ||
| while IFS="=" read -r key value; do | ||
| case "$key" in | ||
| "hostname") hostname="${value}" ;; | ||
| esac | ||
| done <"$1" | ||
| set -e | ||
|
|
||
| # Set the transient or persistent hostname. | ||
|
|
||
| source /opt/ic/bin/logging.sh | ||
| source /opt/ic/bin/metrics.sh | ||
| source /opt/ic/bin/config.sh | ||
|
|
||
| SCRIPT="$(basename $0)[$$]" | ||
|
|
||
| # Get keyword arguments | ||
| for argument in "${@}"; do | ||
| case ${argument} in | ||
| -f=* | --file=*) | ||
| FILE="${argument#*=}" | ||
| shift | ||
| ;; | ||
| -h | --help) | ||
| echo 'Usage: | ||
| Set Transient Or Persistent Hostname | ||
|
|
||
| Arguments: | ||
| -f=, --file= optional: specify the file containing the node-id (Default: /boot/config/node-id) | ||
| -h, --help show this help message and exit | ||
| -t=, --type= mandatory: specify the node type (Examples: host, guest, boundary...) | ||
| ' | ||
| exit 1 | ||
| ;; | ||
| -t=* | --type=*) | ||
| TYPE="${argument#*=}" | ||
| shift | ||
| ;; | ||
| *) | ||
| echo "Error: Argument is not supported." | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| # Set arguments if undefined | ||
| FILE="${FILE:=/boot/config/node-id}" | ||
|
|
||
| function validate_arguments() { | ||
| if [ "${FILE}" == "" -o "${TYPE}" == "" ]; then | ||
| $0 --help | ||
| fi | ||
| } | ||
|
|
||
| function read_config_variables() { | ||
| mgmt_mac=$(get_config_value '.icos_settings.mgmt_mac') | ||
| mgmt_mac=${mgmt_mac//:/} # Remove colons from mgmt_mac | ||
| config_hostname=$(get_config_value '.guestos_settings.guestos_dev_settings.hostname') | ||
| } | ||
|
|
||
| function construct_hostname() { | ||
| if [ "${config_hostname}" != "" ] && [ "${config_hostname}" != "null" ]; then | ||
| HOSTNAME=${config_hostname} | ||
| write_log "Using manually configured hostname: ${HOSTNAME}" | ||
| elif [[ -r ${FILE} && $(cat ${FILE}) != "" ]]; then | ||
| HOSTNAME=$(echo ${TYPE}-${mgmt_mac}-$(cat ${FILE})) | ||
| write_log "Using hostname: ${HOSTNAME}" | ||
| write_metric "setup_hostname" \ | ||
| "1" \ | ||
| "Hostname" \ | ||
| "gauge" | ||
| else | ||
| HOSTNAME=$(echo ${TYPE}-${mgmt_mac}) | ||
| write_log "Using hostname: ${HOSTNAME}" | ||
| write_metric "setup_hostname" \ | ||
| "0" \ | ||
| "Hostname" \ | ||
| "gauge" | ||
| fi | ||
| } | ||
|
|
||
| function setup_hostname() { | ||
| if [ "$(mount | grep '/etc/hostname')" ]; then | ||
| umount /etc/hostname | ||
| fi | ||
|
|
||
| if [ -d /run/ic-node/etc ]; then | ||
| echo "${HOSTNAME}" >/run/ic-node/etc/hostname | ||
| mount --bind /run/ic-node/etc/hostname /etc/hostname | ||
| restorecon -v /etc/hostname | ||
| hostname "${HOSTNAME}" | ||
| fi | ||
| } | ||
|
|
||
| function main() { | ||
| validate_arguments | ||
| read_config_variables | ||
| construct_hostname | ||
| setup_hostname | ||
| } | ||
|
|
||
| if [ -e /boot/config/network.conf ]; then | ||
| cat /boot/config/network.conf | ||
| read_variables /boot/config/network.conf | ||
| hostname="${hostname:-blank}" | ||
| else | ||
| hostname="unnamed" | ||
| fi | ||
|
|
||
| echo "${hostname}" >/run/ic-node/etc/hostname | ||
| mount --bind /run/ic-node/etc/hostname /etc/hostname | ||
| restorecon -v /etc/hostname | ||
| hostname "${hostname}" | ||
| main |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
guestos/setup-hostname.sh will be deleted when GuestOS moves to the config revamp and we will used the consolidated, top level setup-hostname.sh