Merge lp:~canonical-sysadmins/charms/trusty/apache2/apache2-storage into lp:charms/trusty/apache2

[Jacek Nykis]

This branch adds basic juju storage support to the apache2 charm. Tested with local provider (noop) and in OpenStack

[lp:~canonical-sysadmins/charms/trusty/apache2/apache2-storage]

75. By Chris Stratford on 2016-07-04

[jacek,r=chriss] Add "extra_ports" configuration option

[Pete Vander Giessen (petevg)]

I ran into two failures when running bundletester on this charm:

1) "make lint" fails due to a missing flake8 dependency.
2) "make test" fails, as the new code breaks the mocking strategy for one of the existing tests.

Specifically, hooks.tests.ConfigChangedTest.test_config_changed_empty_site_dir fails.

This is because the test patches out config_get, and has it return a mock config object. You can fix the test by doing one of the following:

1) Make the mock more complex, so that you can do config_get("foo"), and get back what you expect.
2) Change line 42 of hooks.py to something like the following:

    set([int(p) for p in config_get()['extra_ports'].split()])

(You may then need to populate 'extra_ports' in the mock config with a list suitable for testing purposes.)

[Pete Vander Giessen (petevg)]

review: Needs Fixing

[Pete Vander Giessen (petevg)]

Testing failures aside, I was able to deploy this manually without errors, and the code looks solid.
Once "make test" passes, I am +1 on merging this.

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5013/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4810/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5021/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5028/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4817/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4822/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5036/

review: Needs Fixing (automated testing)

Unmerged revisions

75. By Chris Stratford on 2016-07-04

[jacek,r=chriss] Add "extra_ports" configuration option

74. By Jacek Nykis on 2016-06-29

Updated README.md

73. By Jacek Nykis on 2016-06-24

Add basic storage support

=== modified file 'README.md'
--- README.md	2016-01-15 22:59:50 +0000
+++ README.md	2016-07-04 12:12:11 +0000
@@ -36,6 +36,10 @@
 ... then to perform a deployment execute the following steps:
 
     juju deploy --repository=charms local:apache2
+Or to deploy with extra storage volume:
+    juju deploy --repository=charms local:apache2 --storage srv=150G
+
+Next set apache vhost template:
     juju set apache2 "vhost_http_template=$(base64 < http_vhost.tmpl)"
 
 

=== modified file 'config.yaml'
--- config.yaml	2016-01-19 20:45:41 +0000
+++ config.yaml	2016-07-04 12:12:11 +0000
@@ -15,6 +15,12 @@
     type: string
     default: ''
     description: Additional custom variables for the vhost templating, in python dict format
+  extra_ports:
+    type: string
+    default: ''
+    description: |
+      Space separated list of additional ports to open. Useful when http or https template
+      contains "Listen" stanzas
   enable_modules:
     type: string
     default: ''

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-02-25 20:46:58 +0000
+++ hooks/hooks.py	2016-07-04 12:12:11 +0000
@@ -640,7 +640,9 @@
     apache_websites.write_configs()
     apache_websites.enable_sites()
     apache_websites.configure_extra_ports()
-    all_ports = apache_websites.list_enabled_ports()
+    relation_ports = apache_websites.list_enabled_ports()
+    config_ports = set([int(p) for p in config_get('extra_ports').split()])
+    all_ports = relation_ports | config_ports
     enable_mpm(config_data)
     # XXX we only configure the worker mpm?
     create_mpm_workerfile()

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-11-20 21:39:49 +0000
+++ metadata.yaml	2016-07-04 12:12:11 +0000
@@ -34,3 +34,10 @@
     interface: syslog
   vhost-config:
     interface: apache-vhost-config
+storage:
+  srv:
+    type: filesystem
+    description: Srv storage
+    location: /srv
+    multiple:
+      range: 0-1