Issue212 for enterprise-2.1 branch

Should address https://github.com/openshift/puppet-openshift_origin/issues/212