Fixed #121 -- added support for Rackspace open cloud

Author: mboersma

Gemfile

@@ -5,3 +5,4 @@ gem 'foodcritic'
 gem 'berkshelf'
 
 gem 'knife-ec2'
+gem 'knife-rackspace'

README.md

@@ -67,7 +67,7 @@ $ berks upload      # upload cookbooks to the chef server
 
 The [Amazon EC2 API Tools](http://aws.amazon.com/developertools/351) will be used to setup basic EC2 infrastructure.  The [Knife EC2 plugin](https://github.com/opscode/knife-ec2) will be used to bootstrap the controller.
 
-	$ contrib/provision-ec2-controller.sh
+	$ contrib/aws/provision-ec2-controller.sh
 
 Once the `deis-controller` node exists on the Chef server, you *must* log in to the WebUI add deis-controller to the `admins` group.  This is required so the controller can delete node and client records during future scaling operations.
 
@@ -79,8 +79,8 @@ Install the Deis client using [Pip](http://www.pip-installer.org/en/latest/insta
 $ sudo pip install deis
 $ deis register http://my-deis-controller.fqdn
 username: myuser
-password: 
-password (confirm): 
+password:
+password (confirm):
 email: myuser@example.com
 Registered myuser
 Logged in as myuser
@@ -118,13 +118,13 @@ Use `deis create --formation=dev` to create an application
 
 ### 6. Deploy & Scale an Application
 
-Change into your application directory and use  ``deis create --formation=dev`` 
+Change into your application directory and use  ``deis create --formation=dev``
 to create a new application attached to the dev formation.
 
 To deploy the application, use `git push deis master`.  Deis will automatically deploy Docker containers and configure Nginx proxies to route requests to your application.
 
-Once your application is deployed, use ``deis scale web=4`` to 
-scale up web containers.  You can also use ``deis logs`` to view 
+Once your application is deployed, use ``deis scale web=4`` to
+scale up web containers.  You can also use ``deis logs`` to view
 aggregated application logs, or ``deis run`` to run admin
 commands inside your application.
 
@@ -134,7 +134,7 @@ To learn more, use `deis help` or browse [the documentation](http://docs.deis.io
 $ deis create --formation=dev
 Creating application... done, created peachy-waxworks
 Git remote deis added
-    
+
 $ git push deis master
 Counting objects: 146, done.
 Delta compression using up to 8 threads.
@@ -164,7 +164,7 @@ Scaling containers... but first, coffee!
 done in 12s
 
 === peachy-waxworks Containers
- 
+
 --- web: `node server.js`
 web.1 up 2013-09-23T19:02:30.745Z (dev-runtime-1)
 web.2 up 2013-09-23T19:36:48.741Z (dev-runtime-1)

api/models.py

@@ -107,7 +107,8 @@ class Provider(UuidAuditedModel):
     PROVIDERS = (
         ('ec2', 'Amazon Elastic Compute Cloud (EC2)'),
         ('mock', 'Mock Reference Provider'),
-        ('static', 'Static Node Provider'),
+        ('rackspace', 'Rackspace Open Cloud'),
+        ('static', 'Static Node'),
     )
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)

client/deis.py

@@ -1569,13 +1569,12 @@ def providers_create(self, args):
         """
         Create a provider for use by Deis
 
-        This command is only necessary when adding a duplicate
-        set of credentials for a provider like EC2.  User accounts
-        already come with a default EC2 provider that has empty
-        credentials, which should be updated in place.
+        This command is only necessary when adding a duplicate set of
+        credentials for a provider. User accounts start with empty providers,
+        EC2 and Rackspace by default, which should be updated in place.
 
-        Use `providers:discover` to update credentials of the
-        default providers and flavors that come pre-installed.
+        Use `providers:discover` to update the credentials for the default
+        providers created with your account.
 
         Usage: deis providers:create <id> <type> <creds>
         """
@@ -1586,8 +1585,21 @@ def providers_create(self, args):
                 if not k in os.environ:
                     msg = "Missing environment variable: {}".format(k)
                     raise EnvironmentError(msg)
-            creds = {'access_key': os.environ['AWS_ACCESS_KEY'],
-                     'secret_key': os.environ['AWS_SECRET_KEY']}
+            creds = {
+                'access_key': os.environ['AWS_ACCESS_KEY'],
+                'secret_key': os.environ['AWS_SECRET_KEY'],
+            }
+        elif type == 'rackspace':
+            # read creds from envvars
+            for k in ('RACKSPACE_USERNAME', 'RACKSPACE_API_KEY'):
+                if not k in os.environ:
+                    msg = "Missing environment variable: {}".format(k)
+                    raise EnvironmentError(msg)
+            creds = {
+                'username': os.environ['RACKSPACE_USERNAME'],
+                'api_key': os.environ['RACKSPACE_API_KEY'],
+                'identity_type': os.environ.get('CLOUD_ID_TYPE', 'rackspace'),
+            }
         else:
             creds = json.loads(args.get('<creds>'))
         id = args.get('<id>')  # @ReservedAssignment
@@ -1619,22 +1631,40 @@ def providers_discover(self, args):
             inp = raw_input('Import these credentials? (y/n) : ')
             if inp.lower().strip('\n') != 'y':
                 print('Aborting.')
-                return
-            creds = {'access_key': os.environ['AWS_ACCESS_KEY'],
-                     'secret_key': os.environ['AWS_SECRET_KEY']}
-            body = {'creds': json.dumps(creds)}
-            sys.stdout.write('Uploading EC2 credentials... ')
-            sys.stdout.flush()
-            response = self._dispatch('patch', '/api/providers/ec2',
-                                      json.dumps(body))
-            if response.status_code == requests.codes.ok:  # @UndefinedVariable
-                print('done')
             else:
-                raise ResponseError(response)
-
+                creds = {'access_key': os.environ['AWS_ACCESS_KEY'],
+                         'secret_key': os.environ['AWS_SECRET_KEY']}
+                body = {'creds': json.dumps(creds)}
+                sys.stdout.write('Uploading EC2 credentials... ')
+                sys.stdout.flush()
+                response = self._dispatch('patch', '/api/providers/ec2',
+                                          json.dumps(body))
+                if response.status_code == requests.codes.ok:  # @UndefinedVariable
+                    print('done')
+                else:
+                    raise ResponseError(response)
         else:
             print('No credentials discovered, did you install the EC2 Command Line tools?')
-            return
+        if 'RACKSPACE_API_KEY' in os.environ and 'RACKSPACE_USERNAME' in os.environ:
+            print("Found Rackspace credentials: {}".format(os.environ['RACKSPACE_API_KEY']))
+            inp = raw_input('Import these credentials? (y/n) : ')
+            if inp.lower().strip('\n') != 'y':
+                print('Aborting.')
+            else:
+                creds = {'username': os.environ['RACKSPACE_USERNAME'],
+                         'api_key': os.environ['RACKSPACE_API_KEY'],
+                         'identity_type': os.environ.get('CLOUD_ID_TYPE', 'rackspace')}
+                body = {'creds': json.dumps(creds)}
+                sys.stdout.write('Uploading Rackspace credentials... ')
+                sys.stdout.flush()
+                response = self._dispatch('patch', '/api/providers/rackspace',
+                                          json.dumps(body))
+                if response.status_code == requests.codes.ok:  # @UndefinedVariable
+                    print('done')
+                else:
+                    raise ResponseError(response)
+        else:
+            print('No Rackspace credentials discovered')
 
     def providers_info(self, args):
         """

client/setup.py

@@ -38,7 +38,9 @@
       author='OpDemand',
       author_email='info@opdemand.com',
       url='https://github.com/opdemand/deis',
-      keywords=['opdemand', 'deis', 'cloud', 'chef', 'docker', 'heroku', 'aws', 'ec2'],
+      keywords=[
+          'opdemand', 'deis', 'cloud', 'chef', 'docker', 'heroku', 'aws', 'ec2', 'rackspace'
+      ],
       classifiers=[
           'Development Status :: 4 - Beta',
           'Environment :: Console',

contrib/ec2/README.md

@@ -0,0 +1,65 @@
+Provision a Deis Controller on Amazon EC2
+=========================================
+
+1. Install [knife-ec2][knifec2] with `gem install knife-ec2` or just
+`bundle install` from the root directory of your deis repository:
+```console
+$ cd $HOME/projects/deis
+$ gem install knife-ec2
+Fetching: knife-ec2-0.6.4.gem (100%)
+Successfully installed knife-ec2-0.6.4
+1 gem installed
+Installing ri documentation for knife-ec2-0.6.4...
+Installing RDoc documentation for knife-ec2-0.6.4...
+```
+
+2. Export your EC2 credentials as environment variables and edit knife.rb
+to read them:
+```console
+$ cat <<'EOF' >> $HOME/.bash_profile
+export AWS_ACCESS_KEY=<your_aws_access_key>
+export AWS_SECRET_KEY=<your_aws_secret_key>
+EOF
+$ source $HOME/.bash_profile
+$ cat <<'EOF' >> $HOME/.chef/knife.rb
+knife[:aws_access_key_id] = "#{ENV['AWS_ACCESS_KEY']}"
+knife[:aws_secret_access_key] = "#{ENV['AWS_SECRET_KEY']}"
+EOF
+$ knife ec2 server list
+Instance ID  Name  Public IP  Private IP  Flavor  Image  SSH Key  Security Groups  State
+```
+
+3. Download and install the [EC2 Command Line Tools][ec2cli] as described in
+[AWS' documentation][ec2cli] and ensure they are available in your $PATH:
+```console
+$ ec2-describe-group
+GROUP	sg-33d1045a	693041077886	default	default group
+PERMISSION	693041077886	default	ALLOWS	tcp	0	65535	FROM	USER	693041077886	NAME default	ID sg-33d1045a	ingress
+PERMISSION	693041077886	default	ALLOWS	udp	0	65535	FROM	USER	693041077886	NAME default	ID sg-33d1045a	ingress
+PERMISSION	693041077886	default	ALLOWS	icmp	-1	-1	FROM	USER	693041077886	NAME default	ID sg-33d1045a	ingress
+```
+
+4. Run the provisioning script to create a new Deis controller:
+```console
+$ ./contrib/ec2/provision-ec2-controller.sh us-west-2
+Creating security group: deis-controller
++ ec2-create-group deis-controller -d 'Created by Deis'
+GROUP	sg-3c3a1c0c	deis-controller	Created by Deis
++ set +x
+Authorizing TCP ports 22,80,443,514 from 0.0.0.0/0...
++ ec2-authorize deis-controller -P tcp -p 22 -s 0.0.0.0/0
+...
+ec2-203.0.113.33.us-west-2.compute.amazonaws.com
+ec2-203-0-113-33.us-west-2.compute.amazonaws.com Chef Client finished, 74 resources updated
+
+Instance ID: i-31c8d106
+Flavor: m1.large
+Image: ami-72e27c42
+Region: us-west-2
+Public DNS Name: ec2-203-0-113-33.us-west-2.compute.amazonaws.com
+Public IP Address: 203.0.113.33
+Run List: recipe[deis::controller]
++ set +x
+```
+
+[knifec2]: http://docs.opscode.com/plugin_knife_ec2.html

contrib/distribute-amis.sh contrib/ec2/distribute-amis.shcontrib/distribute-amis.sh renamed to contrib/ec2/distribute-amis.sh

@@ -14,6 +14,7 @@
 #   6. Distribute the AMI to other regions using `ec2-copy-image`
 #   7. Create/update your Deis flavors to use your new AMIs
 #
+apt-get install python-software-properties -y
 
 # Add the Docker repository key to your local keychain
 # using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
@@ -50,7 +51,7 @@ rm -rf /var/lib/cloud
 
 # purge SSH authorized keys
 rm -f /home/ubuntu/.ssh/authorized_keys
-rm -f /root/.ssh/authorized_keys
+# rm -f /root/.ssh/authorized_keys
 
 # ssh host keys are automatically regenerated
 # on system boot by ubuntu cloud init

contrib/prepare-ubuntu-ami.sh contrib/ec2/prepare-ubuntu-ami.shcontrib/prepare-ubuntu-ami.sh renamed to contrib/ec2/prepare-ubuntu-ami.sh

@@ -5,14 +5,19 @@ if [ -z $1 ]; then
   exit 1
 fi
 
+function echo_color {
+  echo -e "\033[1m$1\033[0m"
+}
+
+THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
+CONTRIB_DIR=$(dirname $THIS_DIR)
+
 # check for Deis' general dependencies
-thisdir=`dirname $0`
-if ! $thisdir/check-deis-deps.sh; then
+if ! $CONTRIB_DIR/check-deis-deps.sh; then
   echo 'Deis is missing some dependencies.'
   exit 1
 fi
 
-
 # check for EC2 API tools in $PATH
 if ! which ec2-describe-group > /dev/null; then
   echo 'Please install the EC2 API command-line tools and ensure they are in your $PATH.'
@@ -23,8 +28,17 @@ fi
 : ${AWS_ACCESS_KEY:?'Please set AWS_ACCESS_KEY in your environment for EC2 API access.'}
 : ${AWS_SECRET_KEY:?'Please set AWS_SECRET_KEY in your environment for EC2 API access.'}
 
-region=$1
+#################
+# chef settings #
+#################
+node_name=deis-controller
+run_list="recipe[deis::controller]"
+chef_version=11.4.4
 
+#######################
+# Amazon EC2 settings #
+#######################
+region=$1
 # see contrib/prepare-ubuntu-ami.sh for instructions
 # on creating your own deis-optmized AMIs
 if [ "$region" == "ap-northeast-1" ]; then
@@ -47,28 +61,19 @@ else
   echo "Cannot find AMI for region: $region"
   exit 1
 fi
-
-# ec2 settings
 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 settings #
+################
+key_name=deis-controller
 ssh_key_path=~/.ssh/$key_name
 ssh_user="ubuntu"
 
-# chef settings
-node_name="deis-controller"
-run_list="recipe[deis::controller]"
-chef_version=11.4.4
-
-function echo_color {
-  echo -e "\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"
@@ -93,9 +98,9 @@ if ! test -e $ssh_key_path; then
   ec2-create-keypair $key_name > $ssh_key_path
   chmod 600 $ssh_key_path
   set +x
-  echo "Saved to $ssh_key_path"
+  echo_color "Saved to $ssh_key_path"
 else
-  echo_color "SSH key $ssh_key_path exists"
+  echo_color "WARNING: SSH key $ssh_key_path exists"
 fi
 
 # create data bags