Skip to content

TRITON-952 sdc-scripts util.sh needs to be rackaware #2

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.

Sign up for GitHub

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

Open
joyent-automation wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TRITON-952 sdc-scripts util.sh needs to be rackaware #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions lib/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,36 @@ function _sdc_setup_amon_agent
/usr/bin/rm -f /var/svc/amon-agent.tgz
}

function get_admin_nic {
local sdc_nics
local admin_nic

if ! sdc_nics=$(_sdc_mdata_get sdc:nics); then
fatal 'could not get NIC information'
fi

if ! admin_nic=$(json -ac \
'this.nic_tag.match(/^admin(_rack_[A-Z0-9_-]+)?$/i) !== null' \
<<< "$sdc_nics"); then
fatal 'could not parse sdc:nics as JSON'
fi

printf '%s' "$admin_nic"
return 0
}

# TODO: should probably do some more error checking here in the event that
# 'mac' or 'ip' are not in the nic object
function get_admin_mac {
printf '%s' "$(get_admin_nic | json mac)"
return 0
}

function get_admin_ip {
printf '%s' "$(get_admin_nic | json ip)"
return 0
}

function setup_config_agent
{
local dirlist=${CONFIG_AGENT_LOCAL_MANIFESTS_DIRS:-}
Expand Down Expand Up @@ -323,19 +353,14 @@ function upload_values
#
function download_metadata
{
local sdc_nics
local admin_mac
local url
local i

if ! sdc_nics=$(_sdc_mdata_get sdc:nics); then
fatal 'could not get NIC information'
fi

if ! admin_mac=$(json -c 'this.nic_tag === "admin"' 0.mac \
<<< "$sdc_nics"); then
if ! admin_mac=$(get_admin_mac); then
fatal 'could not parse sdc:nics as JSON'
fi

if [[ -z $admin_mac ]]; then
warn "skipping download of SAPI metadata: don't have admin NIC"
return 0
Expand Down