Juju Charms Collection
openstack-dashboard package

Merge lp://qastaging/~gnuoy/charms/precise/openstack-dashboard/fix-for-apache24 into lp://qastaging/~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk

Proposed by Liam Young on 2014-05-14

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~gnuoy/charms/precise/openstack-dashboard/fix-for-apache24

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk

Diff against target:

244 lines (+89/-39)

3 files modified

hooks/charmhelpers/core/host.py (+14/-0)
hooks/horizon_utils.py (+33/-9)
unit_tests/test_horizon_utils.py (+42/-30)

To merge this branch:

bzr merge lp://qastaging/~gnuoy/charms/precise/openstack-dashboard/fix-for-apache24

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Liam Young (community)		Needs Resubmitting on 2014-05-16
James Page	2014-05-14	Needs Fixing on 2014-05-15
Review via email: mp+219510@code.qastaging.launchpad.net

Description of the change

The name of the default vhosts was sensibly changed by the debian package maintainers for apache 2.4 (see line ~56 http://sources.debian.net/src/apache2/2.4.9-1/debian/apache2.NEWS). This caused the charm to update the wrong vhost config.

This branch registers two new configs files corresponding to the new default http{,s} vhosts and uses them in preference to the old ones if the installed version of apache2 >= 2.4

There is a corresponding mp to add the cmp_pkgrevno function to charmhelpers ( https://code.launchpad.net/~gnuoy/charm-helpers/add-packacerevno-method/+merge/219509 )

While writing the unit tests it became apparent that some of the existing tests where not checking that the list of calls to register config exactly matched the test list but rather that the call had happened at some point:

"assert_any_call(*args, **kwargs): ...The assert passes if the mock has ever been called, unlike assert_called_with() and assert_called_once_with() that only pass if the call is the most recent one."

I've switched these tests to use assert_has_calls to ensure there is no mix of 2.2 and 2.4 config.

Revision history for this message

Liam Young (gnuoy) wrote on 2014-05-14:

I've tested with precise/havana and icehouse/trusty

lp://qastaging/~gnuoy/charms/precise/openstack-dashboard/fix-for-apache24 updated on 2014-05-14

29. By Liam Young on 2014-05-14: Correct ordering of configs so DEFAULT comes before CONF and SSL

Revision history for this message

James Page (james-page) wrote on 2014-05-15:

Generally looks good - however:

58 +APACHE_24_SSL = "%s/sites-available/000-default.conf" % (APACHE_CONF_DIR)
59 +APACHE_24_DEFAULT = "%s/sites-available/default-ssl.conf" % (APACHE_CONF_DIR)

These constants are named incorrectly - _SSL refers to the non-ssl site config and vica-versa.

review: Needs Fixing

lp://qastaging/~gnuoy/charms/precise/openstack-dashboard/fix-for-apache24 updated on 2014-05-15

30. By Liam Young on 2014-05-15: Fixed apache config file misnaming
31. By Liam Young on 2014-05-15: Added template symlinks with newnames pointing to old

Revision history for this message

James Page (james-page) wrote on 2014-05-15:

Almost:

======================================================================
FAIL: test_restart_map (unit_tests.test_horizon_utils.TestHorizonUtils)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/jamespage/src/charms/landing/openstack-dashboard/unit_tests/test_horizon_utils.py", line 49, in test_restart_map
self.assertEquals(horizon_utils.restart_map(), ex_map)
AssertionError: OrderedDict([('/etc/openstack-dashboard/local_settings.py', ['apache2']), ('/etc/apache2/conf.d/openstack-dashboard.conf', ['apache2']), ('/etc/apache2/conf-available/openstack-dashboard.conf', ['apache2']), ('/etc/apache2/sites-available/default-ssl', ['apache2']), ('/etc/apache2/sites-available/default-ssl.conf', ['apache2']), ('/etc/apache2/sites-available/default', ['apache2']), ('/etc/apache2/sites-available/000-default.conf', ['apache2']), ('/etc/apache2/ports.conf', ['apache2']), ('/etc/haproxy/haproxy.cfg', ['haproxy'])]) != OrderedDict([('/etc/openstack-dashboard/local_settings.py', ['apache2']), ('/etc/apache2/conf.d/openstack-dashboard.conf', ['apache2']), ('/etc/apache2/conf-available/openstack-dashboard.conf', ['apache2']), ('/etc/apache2/sites-available/default-ssl', ['apache2']), ('/etc/apache2/sites-available/000-default.conf', ['apache2']), ('/etc/apache2/sites-available/default', ['apache2']), ('/etc/apache2/sites-available/default-ssl.conf', ['apache2']), ('/etc/apache2/ports.conf', ['apache2']), ('/etc/haproxy/haproxy.cfg', ['haproxy'])])