Fix syntax errors leftover from rebase

deployment/puppet/neutron/manifests/keystone/auth.pp
 add missing $ on
 fix double quote
 fix ensure not first

deployment/puppet/openstack/manifests/nova/controller.pp
 add missing $ on 34
[PRD-1983] tie services' config to AMQP Server
add ipsort function for RHOS deployment order
Fixup some un-needed string interpolations in horizon
[PRD-2360] Radosgw wont start on multiple controllers

refactor radosgw key creation so that its idempotent.
Enable carrier waiting after interface up
More powerfull error messages
add $::ceph::use_ssl to havana
always enable haproxy for swift or radosgw in HA

Setup Swift HAProxy when Swift is enabled either for glance or for
objects, not just when it's enabled for glance. Setup RadosGW HAProxy
when Swift is disabled and RadosGW is enabled. Use active-passive
balancing for RadosGW.
Merge pull request #851 from Mirantis/havana-mopup

Havana mopup