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

make SSH key and host nodes dir available

Author: Matthew Fisher

.gitignore

@@ -59,5 +59,5 @@ Vagrantfile.local
 .chef
 contrib/vagrant/knife-config/admin.pem
 contrib/vagrant/knife-config/chef-validator.pem
-contrib/vagrant/nodes/
-contrib/vagrant/.host_nodes_dir
+controller/provider/vagrant-util/nodes/
+controller/provider/vagrant-util/.host_nodes_dir

contrib/vagrant/provision-vagrant-controller.sh

@@ -11,7 +11,7 @@ function echo_color {
 
 THIS_DIR="$(cd $(dirname $0); pwd)" # absolute path
 CONTRIB_DIR=$(dirname "$THIS_DIR")
-CODE_BASE_DIR=$(dirname "$CONTRIB_DIR/../../")
+CODE_BASE_DIR="$CONTRIB_DIR/../controller"
 
 # For those upgrading from the pre-containerize branch, they may still have some redundant files
 # in their code base.
@@ -44,11 +44,6 @@ if [[ `uname -s` =~ Linux ]]; then
   fi
 fi
 
-echo_color "Ensuring submodules are cloned and up to date..."
-
-# Ensure all submodules are cloned and up to date
-git submodule init && git submodule update
-
 #################
 # chef settings #
 #################
@@ -80,17 +75,17 @@ if [ $? -gt 0 ]; then
 fi
 
 # '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
+# be guaranteed 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 script has to exist
 # inside the codebase.
-nodes_dir="$CONTRIB_DIR/vagrant/nodes"
-nodes_path_file="$CONTRIB_DIR/vagrant/.host_nodes_dir"
+nodes_dir="$CODE_BASE_DIR/provider/vagrant-util/nodes"
+nodes_path_file="$CODE_BASE_DIR/provider/vagrant-util/.host_nodes_dir"
 echo $nodes_dir > $nodes_path_file
 
 # Add the Controller's public SSH key to user's machine. This allows the Controller to
 # issue vagrant commands on the host machine.
 echo_color "Ensuring presence of Controller's public key in your ~/.ssh/authorized_keys file..."
-KEY=$(cat util/ssh_keys/id_rsa_vagrant-deis-controller.pub)
+KEY=$(cat $CODE_BASE_DIR/provider/vagrant-util/ssh_keys/id_rsa_vagrant-deis-controller.pub)
 if [ -z "$(grep "$KEY" ~/.ssh/authorized_keys )" ]; then
   echo $KEY >> ~/.ssh/authorized_keys;
   echo_color "Key added."

contrib/vagrant/util/_controller-reset-db.sh

@@ -22,10 +22,10 @@ echo "Dropping and recreating Deis database..."
 echo "su postgres -c 'dropdb deis && createdb --encoding=utf8 --template=template0 deis'" | ./dshell deis-database
 
 echo "Running South migrations..."
-echo '/app/deis/controller/manage.py syncdb --migrate --noinput' | ./dshell deis-controller
+echo '/app/manage.py syncdb --migrate --noinput' | ./dshell deis-controller
 
 echo "Importing fixtures"
-echo '/app/deis/controller/manage.py loaddata /app/deis/api/fixtures/dev.json' | ./dshell deis-controller
+echo '/app/manage.py loaddata /app/api/fixtures/dev.json' | ./dshell deis-controller
 
 # Most of the fixture data is generic. However the host machine's SSH credentials will change
 # from developer to developer.

contrib/vagrant/util/add_server_dev_deps.sh

@@ -5,7 +5,7 @@ cd /vagrant/contrib/vagrant/util/
 echo "which coverage > /dev/null" | ./dshell deis-controller
 if [ $? -ne 0 ]; then
 	cat <<-EOF | ./dshell deis-controller
-		cd /app/deis/controller
+		cd /app
 		pip install -r dev_requirements.txt
 	EOF
 else

…grant/util/nodes_vagrantfile_template.rb …grant-util/nodes_vagrantfile_template.rbcontrib/vagrant/util/nodes_vagrantfile_template.rb renamed to controller/provider/vagrant-util/nodes_vagrantfile_template.rb contrib/vagrant/util/nodes_vagrantfile_template.rb renamed to controller/provider/vagrant-util/nodes_vagrantfile_template.rb

@@ -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({