Merge pull request #147 from dirkmueller/release/roxy/master

Actually set the caching key prefix
Add pacemaker resource to monitor apache for horizon
Merge pull request #149 from vuntz/ocf

Add pacemaker resource to monitor apache for horizon
Cisco ml2 driver is not compatible with n1kv panel

If the ml2 cisco driver is in use, the n1kv panel for horizon should
not be activated
Merge pull request #134 from rossella/release/roxy/master

Cisco ml2 driver is not compatible with n1kv panel
ha: Follow convention for pacemaker resource naming
Merge pull request #150 from vuntz/ha-convention

Update pacemaker resource names + other conventions for HA
ha: Do not pass params for depth 10 monitoring

The params were specific to each node (because they contain the IP
address of the node), and since we don't do depth 10 monitoring anyway,
we can drop that.
Sort memcache servers in configuration

The order does matter according to the memcache documentation.
Merge pull request #153 from vuntz/sort-memcache

Sort memcache servers in configuration
Merge pull request #152 from vuntz/fix-ocf

ha: Do not pass params for depth 10 monitoring
Update for prepare_role_for_ha_with_haproxy API change
Merge pull request #155 from vuntz/api-change

Update for prepare_role_for_ha_with_haproxy API change
Make fields for password injection configurable

Nova can inject root passwords into instances. Not all hypervisors support
that feature and visibility of the password fileds can get configured.

The relevant patch is not upstreamable, so this is only effective when
the dashboard package from the openSUSE build service is used.

Configure nova_dashboard to not disply the password fields.

Bugzilla entry: https://bugzilla.novell.com/show_bug.cgi?id=869696
Merge pull request #169 from nkrinner/password-field-3

Make fields for password injection configurable
Fix redirection of non-SSL to SSL website when using HA

We need to use the correct port for redirecting (instead of leaving the
non-ssl port), and we need to leave the /server-status page unredirected
(since it's used by pacemaker
(cherry picked from commit c3986ad743e1c2f655f4cd671003bee5c0c65b05)
Avoid races with HA on "python manage.py syncdb"

We didn't have any synchronization for it because this is run in a
notification. But it's actually easy to force a synchronization there
too, by putting the template creating the notification as part of the sync.
(cherry picked from commit e059933162ae0c0bab2614ffcf2b2bc34f46fee7)
Configure horizon before configuring the vhost for horizon in apache

This sounds much safer, and I believe it actually prevents a bug where,
sometimes, static files are not being generated by horizon when using HA
(likely because haproxy is opening a connection to apache and the
not-yet-configured horizon, which could be what is breaking things).
(cherry picked from commit d4234b7c85c2a56b2f5d8ae4cc5a287ffe4541a5)

Conflicts:
	chef/cookbooks/nova_dashboard/recipes/server.rb
Fix apache with HA not running until second chef-client run

It doesn't work on first run because we don't have yet the proper
attributes set when creating the pacemaker resource.
(cherry picked from commit a1f3452e336cdd45ec5f6394fbe23a71afb6fbbf)
Tell pacemaker to start apache with -DSSL when apache needs SSL

This is a transplant / backport of
https://github.com/crowbar/barclamp-pacemaker/pull/138

commit f4127d011f0c3c31545cdec3998b80a5b188aac3

in barclamp-pacemaker.