Experimenting with using hostname rather than IP to SSH into host.

User needs ot have avahi-daemon installed though. Also trying to
update the Chef Server with the Deis Controller's 192 range IP so
that rsyslog has the correct IP.

Conflicts:
	Berksfile.lock
	Gemfile.lock

Author: tombh

Berksfile.lock

@@ -10,9 +10,9 @@
       "locked_version": "2.2.2"
     },
     "deis": {
-      "locked_version": "0.2.1",
+      "locked_version": "0.1.2",
       "git": "https://github.com/opdemand/deis-cookbook.git",
-      "ref": "617d5a2627fdee92ade9499b4a87c6ff85a99c66"
+      "ref": "3277d069b61d261b6ebcab319041442fe38a2ae3"
     }
   }
 }

Gemfile.lock

@@ -1,25 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
     addressable (2.3.5)
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    berkshelf (2.0.10)
-      activesupport (~> 3.2.0)
+    berkshelf (3.0.0.beta3)
       addressable (~> 2.3.4)
+      buff-config (~> 0.2)
+      buff-extensions (~> 0.4)
       buff-shell_out (~> 0.1)
-      chozo (>= 0.6.1)
       faraday (>= 0.8.5)
       hashie (>= 2.0.2)
       minitar (~> 0.5.4)
-      rbzip2 (~> 0.2.0)
       retryable (~> 1.3.3)
-      ridley (~> 1.5.0)
-      solve (>= 0.5.0)
+      ridley (~> 1.6)
+      solve (>= 0.8.0)
       thor (~> 0.18.0)
     buff-config (0.4.0)
       buff-extensions (~> 0.3)
@@ -30,11 +26,11 @@ GEM
     buff-shell_out (0.1.1)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.2)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    celluloid-io (0.14.1)
-      celluloid (>= 0.14.1)
-      nio4r (>= 0.4.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     chef (11.6.2)
       erubis (~> 2.7)
       highline (~> 1.6, >= 1.6.9)
@@ -143,26 +139,24 @@ GEM
     rack (1.5.2)
     rash (0.4.0)
       hashie (~> 2.0.0)
-    rbzip2 (0.2.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.3)
-    ridley (1.5.3)
+    ridley (1.7.1)
       addressable
       buff-config (~> 0.2)
       buff-extensions (~> 0.3)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.14.0)
-      celluloid-io (~> 0.14.0)
+      celluloid (~> 0.15)
+      celluloid-io (~> 0.15)
       erubis
       faraday (>= 0.8.4)
       hashie (>= 2.0.2)
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       net-http-persistent (>= 2.8)
       net-ssh
-      nio4r (>= 0.5.0)
       retryable
       solve (>= 0.4.4)
       varia_model (~> 0.1)

client/deis.py

@@ -1775,12 +1775,8 @@ def providers_discover(self, args):  # noqa
                     "whoami",
                     stderr=subprocess.PIPE
                 ).strip()
-                ip = subprocess.check_output(
-                    "/sbin/ifconfig | \
-                    grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | \
-                    grep -Eo '([0-9]*\.){3}[0-9]*' | \
-                    grep -v '127.0.0.1' | \
-                    head -n1",
+                hostname = subprocess.check_output(
+                    "hostname",
                     stderr=subprocess.PIPE,
                     shell=True
                 ).strip()
@@ -1789,7 +1785,7 @@ def providers_discover(self, args):  # noqa
                 sys.exit(1)
             creds = {
                 'user': user,
-                'ip': ip
+                'host': hostname + ".local"
             }
             body = {'creds': json.dumps(creds)}
             sys.stdout.write('Activating Vagrant as a provider... ')

contrib/vagrant/README.md

@@ -62,9 +62,10 @@ you will need a running SSH server open on port 22.
    `service deis-server restart` and/or `service deis-worker restart` on the VM for your changes to instantly take effect.
    * It's worth having a read of `Vagrantfile.local.example`
 
-7. If you want to hack on the command line client (`/client/deis.py`), install your local dev version rather than
+7. If you want to hack on the command line client (`client/deis.py`), install your local dev version rather than
 the one from Pip.
-    * `cd deis && make install` This will symlink the dev version to your executables path.
+    * `cd deis && make install` This installs the client into your executables path.
+    * `sudo rm /usr/local/bin/deis && sudo ln ./deis.py /usr/local/bin/deis` This will symlink the dev version to your executables path.
     * Your deis controller is available at http://deis-controller.local so you can register with;
     `deis register http://deis-controller.local`
 

contrib/vagrant/provision-controller.sh

@@ -20,6 +20,12 @@ 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
+  echo 'Please install avahi-daemon to broadcast your hostname to the local network.'
+  exit 1
+fi
+
 #################
 # chef settings #
 #################
@@ -41,7 +47,7 @@ knife data bag create deis-apps 2>/dev/null
 
 # Boot the deis-controller VM
 echo_color "Booting $node_name with 'vagrant up'"
-pushd $THIS_DIR
+pushd $THIS_DIR/../../
 vagrant up --provision
 if [ $? -gt 0 ]; then
   echo_color "Canceling provision because 'vagrant up' failed"
@@ -82,7 +88,6 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then #TODO: Might be nice to have flag to make manual
   fi
 
 fi
-popd
 
 echo_color "Provisioning $node_name with knife vagrant..."
 set -x
@@ -96,9 +101,25 @@ knife bootstrap "$node_name.local" \
   --sudo
 set +x
 
-pushd $THIS_DIR/deis-controller
+# 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 \
+}"
+if [ $? -eq 0 ]; then
+  echo_color "IP address updated."
+fi
+
 echo_color "Updating Django site object from 'example.com' to 'deis-controller'..."
-vagrant ssh -c "sudo su deis -c \"psql deis -c \\\"UPDATE django_site SET domain = 'deis-controller.local', name = 'deis-controller.local' WHERE id = 1 \\\"\"" >/dev/null
+vagrant ssh -c "sudo su deis -c \"psql deis -c \\\" \
+  UPDATE django_site \
+  SET domain = 'deis-controller.local', \
+      name = 'deis-controller.local' \
+  WHERE id = 1 \\\"\"" >/dev/null
+
 if [ $? -eq 0 ]; then
   echo_color "Site object updated."
 fi

provider/vagrant.py

@@ -77,7 +77,7 @@ def build_node(node):
     # Make a folder for the VM with its own Vagrantfile. Vagrant will then create a .vagrant folder
     # there too when it first gets booted.
     node_dir = HOST_NODES_DIR + '/' + uid
-    mkdir = 'mkdir ' + node_dir
+    mkdir = 'mkdir -p ' + node_dir
     cp_tpl = 'echo "' + result.replace('"', '\\"') + '" > ' + node_dir + '/Vagrantfile'
     _host_ssh(commands=[mkdir, cp_tpl], creds=node['creds'])
 
@@ -155,15 +155,15 @@ def _host_ssh(creds={}, commands=[]):
     # TODO: Find a way of passing this error onto the CLI client.
     try:
         subprocess.check_call([
-            'nc', '-z', '-w2', creds['ip'], '22'
+            'nc', '-z', '-w2', creds['host'], '22'
         ], stderr=subprocess.PIPE)
     except subprocess.CalledProcessError:
-        raise RuntimeError("Couldn't ping port 22 at host with IP " + creds['ip'])
+        raise RuntimeError("Couldn't ping port 22 at host with IP " + creds['host'])
 
-    ssh = connect_ssh(creds['user'], creds['ip'], 22, PKEY, timeout=120)
+    ssh = connect_ssh(creds['user'], creds['host'], 22, PKEY, timeout=120)
     result, status = exec_ssh(ssh, command)
     if status > 0:
         raise RuntimeError(
-            'SSH to Vagrant host error: ' + result +
-            'Command: ' + command)
+            'SSH to Vagrant host error: ' + result.decode('utf-8') +
+            'Command: ' + command.decode('utf-8'))
     return result