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

[Chris Johnston]

Remove the WebUI from the TS deployment

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

191. By Chris Johnston on 2014-01-31

Remove WebUI from deploy with the TS

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

Can you explain why you want this?

The way our deployment/charms currently work, this is the only way we can get the webui to deploy with everything and know how to talk to the ticket-system. If you are going to do this, I think you need to include changes that will also know how to deploy the webui and have it understand where the ticket-system is located.

I agree it should eventually be this way (actually, not whole-heartedly), but as our code base exists today this is just removing functionality.

review: Needs Information

Unmerged revisions

191. By Chris Johnston on 2014-01-31

Remove WebUI from deploy with the TS

=== renamed file 'juju-deployer/configs/webui_http_vhost' => 'juju-deployer/configs/ts_http_vhost'
=== modified file 'juju-deployer/ticket-system.yaml'
--- juju-deployer/ticket-system.yaml	2014-01-29 20:13:31 +0000
+++ juju-deployer/ticket-system.yaml	2014-01-31 18:18:10 +0000
@@ -1,16 +1,14 @@
 ci-airline-staging:
     series: precise
     services:
-        webui-apache:
+        ts-apache:
             charm: apache2
             branch: lp:charms/precise/apache2
             options:
                 enable_modules: "rewrite proxy proxy_http ssl"
-                vhost_http_template: include-base64://configs/webui_http_vhost
+                vhost_http_template: include-base64://configs/ts_http_vhost
                 servername: ci-airlines.canonical.com
             expose: true
-        webui-app:
-            charm: webui
         ts-django:
             charm: python-django
             options:
@@ -37,5 +35,4 @@
     relations:
         - ["ts-django:pgsql", "ts-postgres:db"]
         - ["ts-django:wsgi", "ts-gunicorn:wsgi-file"]
-        - ["webui-app:website", "webui-apache:website"]
-        - ["ts-django:website", "webui-apache:reverseproxy"]
+        - ["ts-django:website", "ts-apache:reverseproxy"]