Merge "DB connection: prevent src address from binding to a VIP"

diff --cc puppet/services/aodh-base.yaml
Simple merge

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

diff --cc puppet/services/ceilometer-base.yaml
Simple merge

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

diff --cc puppet/services/database/mysql.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/gnocchi-base.yaml
Simple merge

diff --cc puppet/services/heat-engine.yaml
Simple merge

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

diff --cc puppet/services/keystone.yaml
Simple merge

diff --cc puppet/services/manila-base.yaml
Simple merge

diff --cc puppet/services/mistral-base.yaml
Simple merge

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

diff --cc puppet/services/neutron-plugin-plumgrid.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
Simple merge

diff --cc puppet/services/panko-base.yaml
Simple merge

diff --cc puppet/services/sahara-base.yaml
Simple merge