diff options
author | toby <smorgrav@yahoo-inc.com> | 2018-01-22 12:46:57 +0100 |
---|---|---|
committer | toby <smorgrav@yahoo-inc.com> | 2018-01-22 12:46:57 +0100 |
commit | a948a5ef3493c26fc30a0a8f93d63cbd9497da3b (patch) | |
tree | e330c925c1cb042f6808f795556108340e8652c1 /node-admin | |
parent | 5b69ea60fe9b86580230bea2e8792e8b0013b491 (diff) |
Rename NATted to NATed
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index f27f3badd24..4c23c0d9493 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -119,7 +119,7 @@ public class DockerOperationsImpl implements DockerOperations { .withAddCapability("SYS_PTRACE") // Needed for gcore, pstack etc. .withAddCapability("SYS_ADMIN"); // Needed for perf - if (!docker.networkNATted()) { + if (!docker.networkNATed()) { logger.info("Network not nated - setting up with specific ip address on a macvlan"); command.withIpAddress(nodeInetAddress); command.withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME); @@ -146,7 +146,7 @@ public class DockerOperationsImpl implements DockerOperations { command.create(); if (isIPv6) { - if (!docker.networkNATted()) { + if (!docker.networkNATed()) { docker.connectContainerToNetwork(containerName, "bridge"); } @@ -154,7 +154,7 @@ public class DockerOperationsImpl implements DockerOperations { setupContainerNetworkConnectivity(containerName, nodeInetAddress); } else { docker.startContainer(containerName); - if (docker.networkNATted()) { + if (docker.networkNATed()) { setupContainerNetworkConnectivity(containerName, nodeInetAddress); } } @@ -178,7 +178,7 @@ public class DockerOperationsImpl implements DockerOperations { logger.info("Deleting container " + containerName.asString()); docker.deleteContainer(containerName); - if (docker.networkNATted()) { + if (docker.networkNATed()) { logger.info("Delete iptables NAT rules for " + containerName.asString()); try { InetAddress nodeInetAddress = environment.getInetAddressForHost(nodeSpec.hostname); @@ -231,7 +231,7 @@ public class DockerOperationsImpl implements DockerOperations { * Setup iptables NAT rules and add entry in /etc/hosts for node-admin (resolve container hostnames to private ip) */ private void setupContainerNetworkConnectivity(ContainerName containerName, InetAddress externalAddress) throws IOException { - if (docker.networkNATted()) { + if (docker.networkNATed()) { insertNAT(containerName, externalAddress); } else { InetAddress hostDefaultGateway = DockerNetworkCreator.getDefaultGatewayLinux(true); |