Merge lp:~ev/uci-engine/nfss-fixes into lp:~canonical-ci-engineering/uci-engine/nfss

[Evan]

We pin dependencies and charms in lp:uci-engine so two deployments that only differ in time produce the same results. The motivation being that if the deployment breaks, you know it's because of code you changed. Adding the python3 version of the gunicorn charm broke this:

➜ nfss-fixes ./juju-deployer/update.py --assert-pinned; echo $?
cannot import name compare_trees
lp:~canonical-ci-engineering/charms/trusty/gunicorn/gunicorn-py3-support is not pinned to a revno.
1

I also took the opportunity to install the python 2 version of pyramid again. It is co-installable with the python3 version. Supporting both means we don't have to keep a separate copy of the charm for services that haven't been transitioned to python3.

There's no need to install test dependencies with the production service, so I removed mock and webtest from the juju-deployer configuration.

[Andy Doan (doanac)]

why support python2 and python3 for pyramid if we are only doing python3? If/when we need python2-pyramid, i don't mind adding the logic but that just adds X more things to install now?

[lp:~ev/uci-engine/nfss-fixes]

605. By Evan on 2014-06-25

As the restish charm isn't used outside of uci-engine, we can safely leave the python2 version of pyramid out until we need it.

[Evan (ev)]

On 25 June 2014 23:35, Andy Doan <email address hidden> wrote:
> why support python2 and python3 for pyramid if we are only doing python3? If/when we need python2-pyramid, i don't mind adding the logic but that just adds X more things to install now?

I had mistakenly assumed that restish existed outside of our
deployment. Reverted that change as r605.

=== modified file 'juju-deployer/nf-data-collector.yaml.tmpl'
--- juju-deployer/nf-data-collector.yaml.tmpl	2014-06-25 03:59:27 +0000
+++ juju-deployer/nf-data-collector.yaml.tmpl	2014-06-25 22:49:22 +0000
@@ -10,19 +10,19 @@
                 tarball: ${CI_PAYLOAD_URL}
                 framework: pyramid
                 db_migration_cmd: ./nf-data-collector/nfdc/db_migrate.py
-                packages: "python-webtest python-mock python-jinja2 python3-psycopg2 python3-oauthlib python3-webtest python3-mock"
+                packages: "python-jinja2 python3-psycopg2 python3-oauthlib"
                 python_path: ./nf-data-collector:./ci-utils
                 json_status_path: api/v1/status
                 install_sources: |
                     - ${CI_PPA}
                 install_keys: |
                     - ""
-                nagios_check_http_params: -H gatekeeper -I 127.0.0.1 -e '
+                nagios_check_http_params: -H nfdc -I 127.0.0.1 -e '
                     200 OK' --url='/api/v1/' -p 8080
                 nagios_context: ci-airline-staging
         ci-airline-nfdc-gunicorn:
             charm: gunicorn
-            branch: lp:~canonical-ci-engineering/charms/trusty/gunicorn/gunicorn-py3-support
+            branch: lp:~canonical-ci-engineering/charms/trusty/gunicorn/gunicorn-py3-support@34
             options:
                 wsgi_wsgi_file: nfdc:app
                 use_python3: true