Merge lp:~cjohnston/uci-engine/add-graphite-txstatsd into lp:uci-engine

[Chris Johnston]

Add graphite and txstatsd deployments to the CI engine

Add the ability to deploy Graphite and txstatsd charms to the UCI Engine. The charm locations are temporary while they are improved upon and eventually added to the charm store.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:425
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/553/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Andy Doan (doanac)]

you've got to pin your branch revno's for this to pass our tarmac logic.

I'd rather see this deploy to a single host rather than needing 2 systems, but you say that's in-progress, so I'm +1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:425
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/555/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Evan (ev)]

> you've got to pin your branch revno's for this to pass our tarmac logic.

It works \o/

> The charm locations are temporary while they are improved upon and eventually
> added to the charm store.

Can you please put them in a team-owned branch until they've made their way into the charm store?

Say: lp:~ubuntu-ci-engineering/charms/precise/txstatsd/trunk

Thanks!

review: Needs Fixing

[lp:~cjohnston/uci-engine/add-graphite-txstatsd]

426. By Chris Johnston on 2014-05-06

Update graphite deployer

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~cjohnston/uci-engine/add-graphite-txstatsd]

427. By Chris Johnston on 2014-05-15

Update graphite charm, add postgres and apache support

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~cjohnston/uci-engine/add-graphite-txstatsd]

428. By Chris Johnston on 2014-05-26

Switch to team owned graphite charm

[Chris Johnston (cjohnston)]

Set up to deploy from team branch.

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Evan (ev)]

review: Needs Fixing

[lp:~cjohnston/uci-engine/add-graphite-txstatsd]

429. By Chris Johnston on 2014-05-27

Set ansible_ppa false, update names to follow IS req

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Evan (ev)]

You still need to copy or upload the precise ansible package into ppa:canonical-ci-engineering/ci-airline-phase-0

review: Needs Fixing

[Evan (ev)]

Also, please modify charm-helpers¹ to allow specifying the ppa location for ansible. Webops will have this installed already via basenode from the -cat archive, but we'll want a means to pin the version of ansible that we use. This is currently not possible with it blindly installed from ppa:rquillo/ansible.

Thanks

¹ http://bazaar.launchpad.net/~charm-helpers/charm-helpers/devel/view/head:/charmhelpers/contrib/ansible/__init__.py#L91

review: Needs Fixing

Unmerged revisions

429. By Chris Johnston on 2014-05-27

Set ansible_ppa false, update names to follow IS req

428. By Chris Johnston on 2014-05-26

Switch to team owned graphite charm

427. By Chris Johnston on 2014-05-15

Update graphite charm, add postgres and apache support

426. By Chris Johnston on 2014-05-06

Update graphite deployer

425. By Chris Johnston on 2014-04-28

Add graphite and txstatsd deployment

=== added file 'juju-deployer/configs/graphite_http_vhost'
--- juju-deployer/configs/graphite_http_vhost	1970-01-01 00:00:00 +0000
+++ juju-deployer/configs/graphite_http_vhost	2014-05-27 06:55:30 +0000
@@ -0,0 +1,23 @@
+<VirtualHost *:80>
+  ServerAdmin [e-mail]
+  ErrorLog ${APACHE_LOG_DIR}/graphite-error.log
+  LogLevel warn
+  CustomLog ${APACHE_LOG_DIR}/graphite-access.log combined
+
+  DocumentRoot /srv/ci-airlines-graphite.canonical.com
+
+  <Directory />
+    Options FollowSymLinks
+    AllowOverride None
+  </Directory>
+
+  <Directory /srv/ci-airlines-graphite.canonical.com>
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+     Allow from all
+  </Directory>
+
+  RewriteEngine on
+  RewriteRule ^(.*)$ http://{{ graphite }}$1 [P]
+</VirtualHost>

=== added file 'juju-deployer/graphite.yaml.tmpl'
--- juju-deployer/graphite.yaml.tmpl	1970-01-01 00:00:00 +0000
+++ juju-deployer/graphite.yaml.tmpl	2014-05-27 06:55:30 +0000
@@ -0,0 +1,29 @@
+ci-airline-staging:
+    series: precise
+    services:
+        ci-airline-graphite-apache:
+            charm: apache2
+            branch: lp:charms/precise/apache2@53
+            options:
+                enable_modules: "rewrite proxy proxy_http ssl"
+                vhost_http_template: include-base64://configs/graphite_http_vhost
+                servername: ci-airlines-graphite.canonical.com
+            expose: true
+        ci-airline-graphite:
+            charm: graphite
+            branch: lp:~ubuntu-ci-engineering/charms/precise/graphite/trunk@20
+            build: "make"
+            expose: True
+            options:
+                ansible_ppa: False
+                base_dir: "uci-engine"
+        ci-airline-graphite-gunicorn:
+            branch: lp:charms/precise/gunicorn@28
+            charm: gunicorn
+        ci-airlinegraphite-postgres:
+            branch: lp:charms/precise/postgresql@84
+            charm: postgresql
+    relations:
+        - ["ci-airline-graphite:pgsql", "ci-airline-graphite-postgres:db"]
+        - ["ci-airline-graphite:wsgi-file", "ci-airline-graphite-gunicorn:wsgi-file"]
+        - ["ci-airline-graphite:website", "ci-airline-graphite-apache:reverseproxy"]