sts-sponsors team mailing list archive

[Adam Collard <mp+434422@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas:fix-environment-variable-regiond into maas:master.

Commit message:
Set MAAS_CLUSTER_CONFIG in regiond environment

This prevents provisioningserver code from trying to e.g. create
$SNAP_DATA/etc/maas/rackd.conf



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/434422
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~adam-collard/maas:fix-environment-variable-regiond into maas:master.

diff --git a/snap/local/tree/bin/run-regiond b/snap/local/tree/bin/run-regiond
index 2a6276b..e7c86ea 100755
--- a/snap/local/tree/bin/run-regiond
+++ b/snap/local/tree/bin/run-regiond
@@ -9,6 +9,7 @@ export MAAS_ROOT="$SNAP_DATA"
 export MAAS_DATA="$SNAP_COMMON/maas"
 export MAAS_IPC_SOCKET_PATH="$SNAP_DATA/maas-regiond.sock"
 export MAAS_REGION_CONFIG="$SNAP_DATA/regiond.conf"
+export MAAS_CLUSTER_CONFIG="$SNAP_DATA/rackd.conf"
 export MAAS_DNS_CONFIG_DIR="$SNAP_DATA/bind"
 export MAAS_ZONE_FILE_CONFIG_DIR="$SNAP_DATA/bind"
 export MAAS_PROXY_CONFIG_DIR="$SNAP_DATA/proxy"