1) Use private network and static IPs for all vagrant VMs. 2) Use

'knife edit' in provision script to override the ipaddress for the
Controller so that subseuent nodes have the correct rsyslog server
address. 3) Use hostname of the host machine to connect to it over SSH
form the Controller, this gets around IP address changes. But it means
use must have avahi-daemon running.

Author: tombh

Vagrantfile

@@ -11,11 +11,8 @@ Vagrant.configure("2") do |config|
   # Avahi-daemon will broadcast the server's address as deis-controller.local
   config.vm.host_name = "deis-controller"
 
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network. IP will be fetched via DCHP and associated to 'chefserver.local'
-  # using avahi-daemon
-  config.vm.network :public_network
+  # IP will be associated to 'chefserver.local' using avahi-daemon
+  config.vm.network :private_network, ip: "192.168.61.100"
 
   # Chef Server requires at least 1G of RAM to install.
   # You may be able to run it with less once it's installed.

client/deis.py

@@ -1769,7 +1769,7 @@ def providers_discover(self, args):  # noqa
             print("Detected locally running Deis Controller VM")
             # In order for the Controller to be able to boot Vagrant VMs it needs to run commands
             # on the host machine. It does this via an SSH server. In order to access that server
-            # we need to send the current user's name and IP address.
+            # we need to send the current user's name and host.
             try:
                 user = subprocess.check_output(
                     "whoami",
@@ -1781,7 +1781,7 @@ def providers_discover(self, args):  # noqa
                     shell=True
                 ).strip()
             except subprocess.CalledProcessError:
-                print("Error detecting username and host IP address.")
+                print("Error detecting username and host address.")
                 sys.exit(1)
             creds = {
                 'user': user,

contrib/vagrant/nodes_vagrantfile_template.rb

@@ -8,11 +8,8 @@
   # Avahi-daemon will broadcast the node's address as $id.local
   config.vm.host_name = "$id"
 
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network. IP will be fetched via DCHP and associated to '$id.local'
-  # using avahi-daemon
-  config.vm.network :public_network
+  # IP will be associated to '$id.local' using avahi-daemon
+  config.vm.network :private_network, ip: "$ipaddress"
 
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", "$memory"]

contrib/vagrant/provision-controller.sh

@@ -20,8 +20,8 @@ if [ ! -f /etc/ssh/sshd_config ] && [ ! -f /etc/sshd_config ]; then
   exit 1
 fi
 
-# Make sure avahi-daemon is installed
-if ! which avahi-daemon > /dev/null; then
+# Make sure avahi-daemon is installed and running
+if ! pgrep avahi-daemon >/dev/null; then
   echo 'Please install avahi-daemon to broadcast your hostname to the local network.'
   exit 1
 fi
@@ -104,11 +104,11 @@ set +x
 # The IP address detected by Chef is the VM's eth0 10.0.0.0 range address.
 # However we need the 192 range address set on eth1.
 echo_color "Updating the IP address stored on the Chef Server for the Deis Controller node..."
-ipaddress=$(ping -c1 deis-controller.local | head -n1 | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')
-knife exec -E "nodes.transform(\"name:deis-controller\") { \
-  |n| n.normal_attrs[\"network\"][\"ipaddress\"] = "$ipaddress"; \
-  n.save \
-}"
+knife exec -E 'nodes.transform("name:deis-controller") { |n|
+  n.automatic_attrs["ipaddress"] = "192.168.61.100"
+  n.save
+}'
+
 if [ $? -eq 0 ]; then
   echo_color "IP address updated."
 fi

provider/vagrant.py

@@ -12,6 +12,7 @@
 import uuid
 
 from api.models import Layer
+from api.models import Node
 
 # Collect details for connecting to the host machine
 HOST_NODES_DIR = open('/home/vagrant/.host_nodes_dir').read().strip()
@@ -72,7 +73,11 @@ def build_node(node):
     node['params'].setdefault('memory', '512')
     template = open('/opt/deis/controller/contrib/vagrant/nodes_vagrantfile_template.rb')
     raw = string.Template(template.read())
-    result = raw.substitute({'id': uid, 'memory': node['params']['memory']})
+    result = raw.substitute({
+        'id': uid,
+        'ipaddress': '192.168.61.' + str(Node.objects.all().count() + 100),
+        'memory': node['params']['memory']
+    })
 
     # Make a folder for the VM with its own Vagrantfile. Vagrant will then create a .vagrant folder
     # there too when it first gets booted.