handle differing crm_node output for el6 and el7
Merge pull request #255 from cwolferh/ha_util_script_update_for_el6_or_el7

handle differing crm_node output for el6 and el7
Fixed HA Cinder to use puppet-gluster

Transferred Gilles' fix in [1] from non-HA Cinder class to HA Cinder
class. Without it Puppet complains that a file resource in Puppet's
var directory is not defined.

[1] https://github.com/redhat-openstack/astapor/pull/251

Co-Authored-By: Gilles Dubreuil <gilles@redhat.com>
BZ #1106517 - Fix file_line changes to horizon.

https://bugzilla.redhat.com/show_bug.cgi?id=1106517

The port configuration has now been fix in horizon puppet module, so we no
longer need to carry these changes.
Merge pull request #256 from jguiditta/horizon_http_fix

BZ #1106517 -Fix file_line changes to horizon.
ML2 icehouse fix.

Paramaters had changed for ml2 puppet code, update our calls to avoid error.
Merge pull request #257 from jguiditta/icehouse_ml2_fixes

ML2 icehouse fix.
BZ #1103915 - neutron notification setup ordering.

https://bugzilla.redhat.com/show_bug.cgi?id=1103915

Missed a line in the enforcement of ordering.
Merge pull request #258 from jguiditta/bz1103915_ordering

BZ #1103915 - neutron notification setup ordering.
HA config changes for keystone and memcached.
Add multi-backend support to HA Cinder

Used some parts from Rajini's pull request [1].

[1] https://github.com/redhat-openstack/astapor/pull/210

Co-Authored-By: Rajini Ram <rajini_ram@dell.com>
Support both Rabbit and Qpid in quickstack::cinder
Use new cinder classes from non-HA controllers

Switch out old cinder_controller class in favor of new cinder and
cinder_volume classes.

Implementation for BZ "Openstack-foreman: Can't install nfs backend
for cinder"
https://bugzilla.redhat.com/show_bug.cgi?id=1064958
Reuse cinder_volume in Block Storage host group
Add Dell EqualLogic backend for Cinder

Based on Rajini's pull request:
https://github.com/redhat-openstack/astapor/pull/210

Implementation for BZ "Multi-instance (on Multi-Backend) Dell
EqualLogic Cinder Support":
https://bugzilla.redhat.com/show_bug.cgi?id=1105218

Co-Authored-By: Rajini Ram <rajini_ram@dell.com>
Merge pull request #261 from jguiditta/osp5-memcache-keystone

HA config changes for keystone and memcached.
ipmilan add location constraint
open gre in addition to vxlan

This patch teaches quickstack::neutron about GRE.  It opens GRE access
anywhere that vxlan access was already permitted.
Merge pull request #259 from jistr/cinder_backends

Cinder backends
Merge pull request #260 from larsks/bz/1072325

open gre in addition to vxlan