Merge lp:~cjohnston/uci-engine/fix-allowed-hosts into lp:uci-engine

[Chris Johnston]

Add hostname config option to python-django for specifying a domain

Hard coding django_allowed_hosts broke the ability to deploy a development environment. Remove the hard coded django_allowed_hosts, add a hostname config option to the python-django charm to allow adding a domain name.

ALLOWED_HOSTS = ['juju-hp-machine-2', 'juju-hp-machine-2', '15.125.64.86', '10.0.0.86', u'ci-airline.staging.canonical.com']

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:526
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/761/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/761/rebuild

review: Approve (continuous-integration)

[Tom Haddon (mthaddon)]

Looks good to me. There was a longer discussion on IRC about dev/staging/prod configs, but this change is good for now.

review: Approve

[Andy Doan (doanac)]

review: Approve

=== modified file 'charms/precise/python-django/config.yaml'
--- charms/precise/python-django/config.yaml	2014-05-23 12:48:00 +0000
+++ charms/precise/python-django/config.yaml	2014-05-30 14:50:08 +0000
@@ -133,6 +133,11 @@
           Allows setting up extra settings.* values for Django. Acceptable
           values are limited to comma delimited key-value pairs like:
             SETTING_X=foo, SETTING_Y=bar
+    hostname:
+        type: string
+        description: |
+          External hostname for your service, to be added to allowed_hosts.
+          Should not be needed if you specify django_allowed_hosts
     urls_dir_name:
         type: string
         default: "juju_urls"

=== modified file 'charms/precise/python-django/hooks/hooks.py'
--- charms/precise/python-django/hooks/hooks.py	2014-05-23 10:40:13 +0000
+++ charms/precise/python-django/hooks/hooks.py	2014-05-30 14:50:08 +0000
@@ -586,6 +586,8 @@
     ip = run('unit-get public-address').strip()
     private_ip = run('unit-get private-address').strip()
     allowed = [socket.gethostname(), socket.getfqdn(), ip, private_ip]
+    if 'hostname' in config_data:
+        allowed.append(config_data['hostname'])
     if 'django_allowed_hosts' in config_data:
         allowed = config_data['django_allowed_hosts'].split(' ')
     process_template('allowed_hosts.tmpl', {'allowed_hosts': allowed}, dst)

=== modified file 'juju-deployer/ppa-assigner.yaml.tmpl'
--- juju-deployer/ppa-assigner.yaml.tmpl	2014-05-29 23:03:05 +0000
+++ juju-deployer/ppa-assigner.yaml.tmpl	2014-05-30 14:50:08 +0000
@@ -12,7 +12,7 @@
                 application_path: ppa-assigner/
                 django_settings: ppa_assigner.settings
                 django_south: True
-                django_allowed_hosts: ppa-assigner
+                hostname: ppa-assigner
                 python_path: /srv/ci_airline_ppa_django/ci-utils:/srv/ci_airline_ppa_django/ppa-assigner
                 unit-config: include-base64://configs/unit_config.yaml
                 json_status_path: api/v1/status/

=== modified file 'juju-deployer/ticket-system.yaml.tmpl'
--- juju-deployer/ticket-system.yaml.tmpl	2014-05-29 23:03:05 +0000
+++ juju-deployer/ticket-system.yaml.tmpl	2014-05-30 14:50:08 +0000
@@ -27,7 +27,7 @@
                 django_settings: ticket_system.settings
                 django_south: True
                 django_debug: True
-                django_allowed_hosts: ci-airline.staging.canonical.com
+                hostname: ci-airline.staging.canonical.com
                 python_path: /srv/ci_airline_ts_django/ci-utils:/srv/ci_airline_ts_django/ticket_system
                 # this gets shared with gunicorn via a relation-set in this charm
                 wsgi_wsgi_file: ticket_system.wsgi:application