Merge lp:~cjohnston/ubuntu-ci-services-itself/ts-base_image_default into lp:ubuntu-ci-services-itself

[Chris Johnston]

Add a BASE_IMAGE_DEFAULT for defining the default base image to be used by the CI Engine.

Add a BASE_IMAGE_DEFAULT for defining the default base image to be used by the CI Engine.

[lp:~cjohnston/ubuntu-ci-services-itself/ts-base_image_default]

152. By Chris Johnston on 2014-01-27

Add default base image url to juju deployer

[Andy Doan (doanac)]

lgtm

review: Approve

[Chris Johnston (cjohnston)]

 merge approved

review: Approve

=== modified file 'juju-deployer/ticket-system.yaml'
--- juju-deployer/ticket-system.yaml	2014-01-24 21:31:18 +0000
+++ juju-deployer/ticket-system.yaml	2014-01-27 16:44:14 +0000
@@ -21,6 +21,7 @@
                 django_settings: ticket_system.settings
                 django_south: True
                 django_debug: True
+                django_extra_settings: BASE_IMAGE_DEFAULT="http://cloud-images.ubuntu.com/releases/13.10/release-20131015/ubuntu-13.10-server-cloudimg-amd64-disk1.img"
                 python_path: /srv/ts_django/ci-utils:/srv/ts_django/ticket_system
                 # this gets shared with gunicorn via a relation-set in this charm
                 wsgi_wsgi_file: ticket_system.wsgi:application

=== modified file 'ticket_system/ticket/models.py'
--- ticket_system/ticket/models.py	2014-01-24 20:49:37 +0000
+++ ticket_system/ticket/models.py	2014-01-27 16:44:14 +0000
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.db import models, IntegrityError
+from django.conf import settings
 from project.models import SourcePackage
 from lazr.enum import DBEnumeratedType, DBItem
 
@@ -110,7 +111,8 @@
     status = models.IntegerField(
         choices=_choices(TicketWorkflowStepStatus), max_length=4096,
         default=000)
-    base_image = models.CharField(max_length=4096)
+    base_image = models.CharField(max_length=4096,
+                                  default=settings.BASE_IMAGE_DEFAULT)
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
     # Comma-separated list of binary names to install or not install when

=== modified file 'ticket_system/ticket_system/settings.py'
--- ticket_system/ticket_system/settings.py	2014-01-06 21:13:35 +0000
+++ ticket_system/ticket_system/settings.py	2014-01-27 16:44:14 +0000
@@ -186,6 +186,8 @@
     }
 }
 
+BASE_IMAGE_DEFAULT = ""
+
 # Use local settings if available
 try:
     from local_settings import *