move some hardcoded values to a config file

Author: euven

.gitignore

@@ -1,4 +1,5 @@
 config.sh
+config.ini
 .ssh
 *.pyc
 composer.phar

README.md

@@ -19,6 +19,7 @@ sudo apt-get install zip python-pip python-dev
 sudo pip install python-novaclient
 ```
 * Create an ssh key pair for jenkins; add the public key to openstack, with a key name of: jenkins
+* Copy config-dist.ini to config.ini and edit
 * As the jenkins user, checkout this repo to `/var/lib/jenkins/moodle-ci`
 * Download Selenium's standalone server (version: $SELENIUM_VERSION) and stick it in `/var/lib/jenkins/moodle-ci/` too
 * `cp config-dist.sh config.sh` and fill in creds

config-dist.ini

@@ -0,0 +1,4 @@
+[openstack]
+imagename="youcloudimagesnapshotname"
+flavor="c1.c4r4"
+sshkeyname="openstacksshkeyname"

openstack.py

@@ -3,14 +3,18 @@
 from novaclient import client
 import novaclient.exceptions
 from credentials import get_nova_creds
+import ConfigParser
 
 class cloudslave:
     def __init__(self, name):
+        # read the config
+        config = ConfigParser.ConfigParser()
+        config.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config.ini'))
+
         self.name = name
-        self.imagename = "jenkins-tests"
-        self.flavorname = "c1.c4r4"
-        #self.flavorname = "c1.c8r8"
-        self.sshkeyname = "jenkins"
+        self.imagename = config.get('openstack', 'imagename')
+        self.flavorname = config.get('openstack', 'flavor')
+        self.sshkeyname = config.get('openstack', 'sshkeyname')
 
     def spinup(self):
         # initialise novaclient instance