diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-01-18 13:42:41 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahoo-inc.com> | 2017-01-18 13:42:41 +0100 |
| commit | 2a1084f743f49d5ef9128075af4f1560eb074c62 (patch) | |
| tree | a08b4b7e84abfbf8dc35357c1299031b2b89e876 /node-admin | |
| parent | 06ab8d7664fa79b89b2cb65e18d643d0557cede8 (diff) | |
Use vespa-macvlan for node-admin on Mac
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index 5e9f22f0a14..2dd2ef6f6ac 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -93,6 +93,10 @@ public class LocalZoneUtils { .withEnvironment("REGION", environment.getRegion()) .withEnvironment("CONFIG_SERVER_ADDRESS", CONFIG_SERVER_HOSTNAME); + if (DockerTestUtils.getSystemOS() == DockerTestUtils.OS.Mac_OS_X) { + createCmd.withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME); + } + Arrays.asList( "/home/y/logs", "/home/y/var/cache", |