diff --git a/smf/sled-agent/config-rss.toml b/smf/sled-agent/config-rss.toml index 98b03cdcce0..4d871ef723e 100644 --- a/smf/sled-agent/config-rss.toml +++ b/smf/sled-agent/config-rss.toml @@ -16,7 +16,7 @@ rack_secret_threshold = 1 # IP address of Internet gateway # # NOTE: In the lab, use "172.20.15.225" -# address = "192.168.1.1" +address = "172.20.11.1" # MAC address of the internet gateway in the local network, i.e., of the above # IP address. @@ -73,7 +73,7 @@ gz_addresses = [] type = "nexus" internal_ip = "fd00:1122:3344:0101::3" # NOTE: In the lab, use "172.20.15.226" -external_ip = "192.168.1.20" +external_ip = "172.20.11.2" # TODO(https://github.com/oxidecomputer/omicron/issues/732): Nexus # should allocate Oximeter services. diff --git a/smf/sled-agent/config.toml b/smf/sled-agent/config.toml index 9af1db6f2e2..23de0f45226 100644 --- a/smf/sled-agent/config.toml +++ b/smf/sled-agent/config.toml @@ -19,7 +19,7 @@ zpools = [ # # If empty, this will be equivalent to the first result from: # $ dladm show-phys -p -o LINK -# data_link = "igb0" +data_link = "cxgbe0" [log] level = "info" diff --git a/tools/build_and_deploy_to_folgers.sh b/tools/build_and_deploy_to_folgers.sh new file mode 100755 index 00000000000..74517cf95eb --- /dev/null +++ b/tools/build_and_deploy_to_folgers.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -eux + +SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd "${SOURCE_DIR}/.." + +TARGET="folgers" + +echo "Packaging Omicron" +cargo run --release --bin omicron-package -- package + +echo "Transferring Omicron to ${TARGET}" +rsync --delete -Paz out target/release/omicron-package package-manifest.toml root@${TARGET}:/root/omicron + +echo "Deploying Omicron to ${TARGET}" +ssh root@${TARGET} "cd /root/omicron && ./omicron-package install"