vagrant: MASTER_IP is only needed in the Vagrantfile itself

Remove all traces of MASTER_IP in all deployment scripts. Change-Id: I53890672f9e38cfc2df53453a86090464cdd11ba Signed-off-by: Roman Mohr <[email protected]>
ctrlaltdel · Dec 8, 2016 · 6f42c0b · 6f42c0b
1 parent cec8678
commit 6f42c0b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -58,9 +58,6 @@ Vagrant.configure(2) do |config|
         #!/bin/bash
         set -xe
         export WITH_LOCAL_NFS=true
-        export KUBERNETES_MASTER=true
-        export VM_IP=#{$master_ip}
-        export MASTER_IP=#{$master_ip}
         export NETWORK_PROVIDER=#{$network_provider}
         cd /vagrant/cluster
         bash setup_kubernetes_master.sh
@@ -82,7 +79,6 @@ Vagrant.configure(2) do |config|
       node.vm.provision "shell", inline: <<-SHELL
         #!/bin/bash
         set -xe
-        export MASTER_IP=#{$master_ip}
         cd /vagrant/cluster
         bash setup_kubernetes_node.sh
         set +x

diff --git a/cluster/setup_kubernetes_master.sh b/cluster/setup_kubernetes_master.sh
@@ -1,9 +1,6 @@
 #/bin/bash -xe
 
-# Example environment variables (set by Vagrantfile)
-# export KUBERNETES_MASTER=true
-# export VM_IP=192.168.200.2
-# export MASTER_IP=$VM_IP
+export KUBERNETES_MASTER=true
 bash ./setup_kubernetes_common.sh
 
 # Cockpit with kubernetes plugin

diff --git a/cluster/setup_kubernetes_node.sh b/cluster/setup_kubernetes_node.sh
@@ -1,7 +1,5 @@
 #/bin/bash -xe
 
-# Example environment variables (set by Vagrantfile)
-# export MASTER_IP=192.168.200.2
 bash ./setup_kubernetes_common.sh
 
 ADVERTISED_MASTER_IP=`dig +short master`