fix vagrant provider in containerized env by using ip_addr instead of avahi hostnames

Author: Gabriel Monroy

Vagrantfile

@@ -15,6 +15,12 @@ Vagrant.configure("2") do |config|
     vb.customize ["modifyvm", :id, "--memory", "2048"]
   end
 
+  # 'deis provider:discover' detects the host machine's user and IP address, however, that command cannot
+  # be guareteed to run inside the deis codebase. Therefore we can't use that opportunity to discover
+  # the path of the codebase on the host machine. Therefore we do it now as this Vagrantfile has to exist
+  # inside the codebase.
+  nodes_dir = File.dirname(__FILE__) + '/contrib/vagrant/nodes'
+
   config.vm.provision :shell, inline: <<-SCRIPT
     # install latest stable chef for subsequent provision blocks
     sudo apt-get install -yq curl
@@ -24,6 +30,8 @@ Vagrant.configure("2") do |config|
     # Avahi-daemon broadcasts the machine's hostname to local DNS.
     # Therefore 'deis-controller.local' in this case.
     sudo apt-get install -yq avahi-daemon
+    # Make a record of where the deis code base is on the host machine
+    echo "#{nodes_dir}" > /home/vagrant/.host_nodes_dir
   SCRIPT
 
   # load chef config from ~/.chef/knife.rb (requires `vagrant plugin install chef`)

client/deis.py

@@ -814,7 +814,7 @@ def config_list(self, args):
                 width = max(map(len, keys)) + 5
                 for k in keys:
                     v = values[k]
-                    print(("{k:<"+str(width)+"} {v}").format(**locals()))
+                    print(("{k:<" + str(width) + "} {v}").format(**locals()))
             else:
                 output = []
                 for k in keys:
@@ -1907,19 +1907,12 @@ def providers_discover(self, args):  # noqa
                     "whoami",
                     stderr=subprocess.PIPE
                 ).strip()
-                hostname = subprocess.check_output(
-                    "hostname",
-                    stderr=subprocess.PIPE,
-                    shell=True
-                ).strip()
             except subprocess.CalledProcessError:
-                print("Error detecting username and host address.")
+                print("Error detecting username.")
                 sys.exit(1)
-            if not hostname.endswith('.local'):
-                hostname += '.local'
             creds = {
                 'user': user,
-                'host': hostname
+                'host': '192.168.61.1'
             }
             body = {'creds': json.dumps(creds)}
             sys.stdout.write('Activating Vagrant as a provider... ')

deis/settings.py

@@ -292,7 +292,7 @@
 CM_MODULE = os.environ.get('DEIS_CM_MODULE', 'cm.mock')
 
 # default providers, typically overriden in local_settings to include ec2, etc.
-PROVIDER_MODULES = ('mock', 'digitalocean', 'ec2', 'rackspace', 'static')
+PROVIDER_MODULES = ('mock', 'digitalocean', 'ec2', 'rackspace', 'vagrant', 'static')
 
 # default to sqlite3, but allow postgresql config through envvars
 DATABASES = {

provider/vagrant.py

@@ -77,11 +77,12 @@ def build_node(node):
 
     # Create a new Vagrantfile from a template
     node['params'].setdefault('memory', '512')
-    template = open('/opt/deis/controller/contrib/vagrant/nodes_vagrantfile_template.rb')
+    template = open('/app/deis/contrib/vagrant/nodes_vagrantfile_template.rb')
     raw = string.Template(template.read())
+    ip_addr = '192.168.61.' + str(Node.objects.all().count() + 100)
     result = raw.substitute({
         'id': uid,
-        'ipaddress': '192.168.61.' + str(Node.objects.all().count() + 100),
+        'ipaddress': ip_addr,
         'memory': node['params']['memory']
     })
 
@@ -107,15 +108,12 @@ def build_node(node):
     )
 
     provider_id = uid
-    fqdn = provider_id
-    if not fqdn.endswith('.local'):
-        fqdn += '.local'  # hostname is broadcast via avahi-daemon
     metadata = {
         'id': uid,
-        'fqdn': fqdn,
+        'fqdn': ip_addr,
         'flavor': node['params']['memory']
     }
-    return provider_id, fqdn, metadata
+    return provider_id, ip_addr, metadata
 
 
 def destroy_node(node):