Merge "Availability monitoring agents support"

diff --cc puppet/services/cinder-volume.yaml
Simple merge

diff --cc puppet/services/glance-api.yaml
Simple merge

diff --cc puppet/services/glance-registry.yaml
Simple merge

diff --cc puppet/services/ironic-api.yaml
Simple merge

diff --cc puppet/services/neutron-api.yaml
Simple merge

diff --cc puppet/services/swift-proxy.yaml
Simple merge