Add missing bin/ dirs and remove bin from .gitignore.

Author: mboersma

.gitignore

@@ -10,7 +10,6 @@ dist
 build
 eggs
 parts
-bin
 var
 sdist
 develop-eggs

chef/bin/provision-ec2-controller

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# ec2 settings
+region="us-west-2"
+image="ami-bf41d28f"
+flavor="m1.large"
+ebs_size=100
+sg_name=deis-controller
+sg_src=0.0.0.0/0
+key_name=deis-controller
+export EC2_URL=https://ec2.$region.amazonaws.com/
+
+# ssh settings
+ssh_key_path=~/.ssh/$key_name
+ssh_user="ubuntu"
+
+# chef settings
+node_name="deis-controller"
+run_list="role[deis-controller]"
+
+function echo_color {
+  echo "\033[1m$1\033[0m"
+}
+
+# create security group and authorize ingress
+if ! ec2-describe-group | grep -q "$sg_name"; then
+  echo_color "Creating security group: $sg_name"
+  set -x
+  ec2-create-group $sg_name -d "Managed by Deis"
+  set +x
+  echo_color "Authorizing TCP ports 22,80,443 from $sg_src..."
+  set -x
+  ec2-authorize deis-controller -P tcp -p 22 -s $sg_src >/dev/null
+  ec2-authorize deis-controller -P tcp -p 80 -s $sg_src >/dev/null
+  ec2-authorize deis-controller -P tcp -p 443 -s $sg_src >/dev/null
+  set +x
+else
+  echo_color "Security group $sg_name exists"
+fi
+
+# create ssh keypair and store it
+if ! test -e $ssh_key_path; then
+  echo "Creating new SSH key: $key_name"
+  set -x
+  ec2-create-keypair $key_name > $ssh_key_path
+  chmod 600 $ssh_key_path
+  set +x
+  echo "Saved to $ssh_key_path"
+else
+  echo_color "SSH key $ssh_key_path exists"
+fi
+
+# forcing update of chef server
+`dirname $0`/update-chef-server
+
+# trigger ec2 instance bootstrap
+echo_color "Provisioning $node_name with knife ec2..."
+set -x
+knife ec2 server create \
+ --region $region \
+ --image $image \
+ --flavor $flavor \
+ --groups $sg_name \
+ --tags Name=$node_name \
+ --ssh-key $key_name \
+ --ssh-user $ssh_user \
+ --identity-file $ssh_key_path \
+ --node-name $node_name \
+ --ebs-size $ebs_size \
+ --run-list $run_list
+set +x

chef/bin/update-chef-server

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+function echo_color {
+  echo "\033[1m$1\033[0m"
+}
+
+# change directory to the git repository root
+cd $(git rev-parse --show-toplevel)/chef
+
+echo_color "Updating cookbooks..."
+knife cookbook upload -a
+
+echo_color "Updating roles..."
+for role in `ls roles/*.rb`; do
+  knife role from file $role
+done
+
+data_bags=$(knife data bag list)
+
+if test "${data_bags#*deis-formations}" == "$data_bags"; then
+  echo_color "Creating deis-formations data bag..."
+  knife data bag create deis-formations
+fi
+
+if test "${data_bags#*deis-build}" == "$data_bags"; then
+  echo_color "Creating deis-build data bag..."
+  knife data bag create deis-build
+  echo "Uploading initial data bag items..."
+  knife data bag from file deis-build data_bags/deis-build/gitosis.json
+fi
+
+if test "${data_bags#*deis-ssh}" == "$data_bags"; then
+  echo_color "Creating deis-ssh data bag..."
+  knife data bag create deis-ssh
+  echo "Uploading initial data bag items..."
+  for item in `ls data_bags/deis-ssh`; do
+    knife data bag from file deis-ssh data_bags/deis-ssh/$item
+  done
+fi
+
+echo_color "Chef server up-to-date."

controller/bin/build-release-run

@@ -0,0 +1,40 @@
+#!/opt/deis/controller/venv/bin/python
+import os
+import sys
+import json
+
+if __name__ == '__main__':
+    # prepare pythonpath and django settings
+    base_path = os.path.abspath(os.path.join(__file__, '..', '..'))
+    sys.path.insert(0, base_path)
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'deis.settings'
+    from api import models
+    # deserialize build
+    inp = sys.stdin.read()
+    build = json.loads(inp)
+    # pull username out of ssh key
+    ssh_key = build.pop('ssh_key')
+    username = ssh_key.split('_')[0]
+    from django.contrib.auth.models import User
+    u=User.objects.get(username=username)
+    build['owner'] = u
+    # lookup formation
+    formation_id = build.pop('formation')
+    formation = models.Formation.objects.get(
+        owner=u, id=formation_id)
+    build['formation'] = formation
+    # create the new build
+    b = models.Build.objects.create(**build)
+    # send release signal
+    models.release_signal.send(sender=b,
+        build=b, formation=formation, user=u)
+    # pull the formation again with the new release
+    formation = models.Formation.objects.get(
+        owner=u, id=formation_id)
+    # calculate the formation and converge it
+    databag = formation.calculate()
+    formation.converge(databag)
+    # return a json dump of the databag
+    sys.stdout.write(json.dumps(databag))
+    sys.stdout.flush()
+    sys.exit(0)