MAAS

Merge ~adam-collard/maas:maas-agent-run-dir into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. maas-agent-run-dir
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 672559bb6cc885b7ab37a72d5deceb4cbb44f5ee
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:maas-agent-run-dir
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
snap/local/tree/bin/run-rackd (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anton Troyanov Approve
Review via email: mp+461110@code.launchpad.net

Commit message

fix: MAAS_AGENT_HTTPPROXY_SOCKET_PATH

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b maas-agent-run-dir lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 672559bb6cc885b7ab37a72d5deceb4cbb44f5ee

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/local/tree/bin/run-rackd b/snap/local/tree/bin/run-rackd
2index 382f411..1b24070 100755
3--- a/snap/local/tree/bin/run-rackd
4+++ b/snap/local/tree/bin/run-rackd
5@@ -23,7 +23,7 @@ export MAAS_DATA="$SNAP_COMMON/maas"
6 export MAAS_CACHE="$SNAP_COMMON/maas/cache"
7 export MAAS_CLUSTER_CONFIG="$SNAP_DATA/rackd.conf"
8 export MAAS_AGENT_CONFIG="$SNAP_DATA/agent.yaml"
9-export MAAS_AGENT_HTTPPROXY_SOCKET_PATH="/run/snap.$SNAP_INSTANCE_NAME/agent-httpproxy.sock"
10+export MAAS_AGENT_HTTPPROXY_SOCKET_PATH="/run/snap.$SNAP_INSTANCE_NAME/httpproxy.sock"
11 export MAAS_DNS_CONFIG_DIR="$SNAP_DATA/bind"
12 export MAAS_ZONE_FILE_CONFIG_DIR="$SNAP_DATA/bind"
13 export MAAS_PROXY_CONFIG_DIR="$SNAP_DATA/proxy"

Subscribers

People subscribed via source and target branches