Merge pull request #661 from opdemand/655-vagrant-nodes

make SSH key and host nodes dir available

Author: Matthew Fisher

provider/vagrant-util/nodes_vagrantfile_template.rb

@@ -0,0 +1,26 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "deis-server"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "https://s3-us-west-2.amazonaws.com/opdemand/ubuntu-12.04.3-amd64-vbox.box"
+
+  # Avahi-daemon will broadcast the node's address as $id.local
+  config.vm.host_name = "$id"
+
+  # 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"]
+  end
+
+  # Enable [hostname].local autodiscovery between VMs
+  config.vm.provision :shell, inline: <<-SCRIPT
+    # Avahi-daemon broadcasts the machine's hostname to local DNS.
+    # So $id.local in this case
+    sudo apt-get install -yq avahi-daemon
+    sudo service avahi-daemon restart
+    echo "*.* @@192.168.61.100:514" > /etc/rsyslog.d/51-remote.conf
+  SCRIPT
+end

provider/vagrant-util/ssh_keys/id_rsa_vagrant-deis-controller

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA7Q2FVbhqSv0U1wH558Uv69sJhtFQCyjozTVCvTL8b6kh6jJL
+38lY2zjKIoB0XfDtv7HSwwMH1tBS0XLJt15qlA4MKTpxIcc1xoysF9n+QtqVFRGU
+ff1g6ed1bfZAADfEeZXGM4Y7aJUDyFjEqj5ubKjHONLVxSahUR2aSczKL5P0ahNc
+XwE51QR8xTqGum4GQDhoO/yGIngJW+oktCiGgbO0qaNjRP0MuXuGtIq1dzJGIInq
+GZrVHtasf9mNKBtNmE8vyKTlvVxcqiiGifR0/PfHN5fVmBFfDCw7pqp0djF7SZ/v
+jXY1gArgXqGMFxKxKU6h3mq++9JE5NOtmPNFowIDAQABAoIBAB2sr6BHcabpf45a
+xPnqiVExHkQuN6LuABaQMEaW91rTBVfX6/+bqO/ocAVZpzeLTXfNvuCCpJyTf4qQ
+oAfAXf8iswsGMdtUoLq2KWTi+R1NV5RHmxsaeONPAjg9t01Prdy6jxEsIIu6+7o8
+woG9Rv17M1U9r1z6tP7+ga3zYOwLj8PtjAGkSCCaT4jzlVhbmj7nAszOG4nWT8UD
+sP0OOLnASnhC/chsuVrZBZJyp5GSMVByc+EwhgwntPUC6pUM/C9unIZicuZy66oa
+9IFgCdqj5gov91TDuQtVgLsCcHOuJtJH62ySHDEM/diNZw+MiqVVNTr6bKmwa6zK
+lLT6soECgYEA9zR5DOFWW/0RjS3NjTJ88VIcMZPcGMdaLdAI5We+x0rzH/bC8+Ud
+RzrBnu3hndxcmTy2bGJiSA3U1+pbwkI6xG8KPfkR75Exc2265oTXL9/gIvb2Rqsk
+zfzdKnx89PaJx6hS3pZl/2X+UgSfB173Lf3aC07KHOyz8ujFH5vCuNMCgYEA9XyV
+Me89+Ibd1mbGRavcB/7r2yvnv9yefnQuclNNe5BW2pRAOxgmnLFz3q5QaLqbq481
+FoDJvLm0iKw2SPbdoF07FdoXOktwnjBdMUv+VuEAJ56uPgVq8zINqS0TDbldO4rf
+jGTaxAuIiK/IXZ8oDOjOwD6B0HzMhb7zbC1jPfECgYA8HT2GnVGD4yGehFHlES8C
+/CWxBLTULb5HP7y6FKV3D0naLwavirq49JfbDxv7aHf4J6Rw7Ofbf8mPjAUuUy65
+UAtckLIE4Pj2ieuWXR17HeUCe63d94ZmtSQPTeCRLVbJ/6vPRyGcnu/egBMwFq7j
+N0UL1OgfaoxD+Mje6+DJUwKBgEjLmspl8XCDPcFYVK9QWT0dwP8LM/vXBkDlXuiT
+/0QG91p1394mOTz5+iwscLe9rm/fVZTIuAn436ovtyFH40ysmNrQA1dMC6c9HEWE
+DXXh3tPg4DaQELjxPM/QB/hn4VfIxKWzOpQr/17ZEYeBrLS3TKgBYSlb+KIoj7Ki
+eu1hAoGARRno3TTabDYCYqOdTujjPoDPK0qSHoJSO4+s3oms44zRg7VgHH6f5Vfy
+a1rUhy2yzoK/CLx7mJZQhJZ/8wplJgf0wiShIJC2czKRa3duqGxOzwGFhuB0efl6
+53mWkd6uZFYEZKTII5YJd8S1OfKteh/9pE0hGHgjTtZVOHC/qgg=
+-----END RSA PRIVATE KEY-----

provider/vagrant-util/ssh_keys/id_rsa_vagrant-deis-controller.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtDYVVuGpK/RTXAfnnxS/r2wmG0VALKOjNNUK9MvxvqSHqMkvfyVjbOMoigHRd8O2/sdLDAwfW0FLRcsm3XmqUDgwpOnEhxzXGjKwX2f5C2pUVEZR9/WDp53Vt9kAAN8R5lcYzhjtolQPIWMSqPm5sqMc40tXFJqFRHZpJzMovk/RqE1xfATnVBHzFOoa6bgZAOGg7/IYieAlb6iS0KIaBs7Spo2NE/Qy5e4a0irV3MkYgieoZmtUe1qx/2Y0oG02YTy/IpOW9XFyqKIaJ9HT898c3l9WYEV8MLDumqnR2MXtJn++NdjWACuBeoYwXErEpTqHear770kTk062Y80Wj vagrant@deis-controller

provider/vagrant.py

@@ -17,12 +17,12 @@
 
 logger = logging.getLogger(__name__)
 
-CONTRIB_PATH = '/app/deis/contrib/vagrant'
+VAGRANT_UTIL_PATH = '/app/provider/vagrant-util'
 
 # Collect details for connecting to the host machine
 try:
-    HOST_NODES_DIR = open('{}/.host_nodes_dir'.format(CONTRIB_PATH)).read().strip()
-    PKEY = open('{}/util/ssh_keys/id_rsa_vagrant-deis-controller'.format(CONTRIB_PATH)).read()
+    HOST_NODES_DIR = open('{}/.host_nodes_dir'.format(VAGRANT_UTIL_PATH)).read().strip()
+    PKEY = open('{}/ssh_keys/id_rsa_vagrant-deis-controller'.format(VAGRANT_UTIL_PATH)).read()
 except IOError as err:
     logger.warn(err)
 
@@ -79,7 +79,7 @@ def build_node(node):
 
     # Create a new Vagrantfile from a template
     node['params'].setdefault('memory', '512')
-    template = open('/app/deis/contrib/vagrant/util/nodes_vagrantfile_template.rb')
+    template = open('{}/nodes_vagrantfile_template.rb'.format(VAGRANT_UTIL_PATH))
     raw = string.Template(template.read())
     ip_addr = '192.168.61.' + str(Node.objects.all().count() + 100)
     result = raw.substitute({