Remove Puppet 4 repo fixes
Remove Puppet 4 repo fixes

These are no longer needed since we dont run Puppet 4.
Also fixes some hardcoded EL 7 values.

Change-Id: Ia8ad51db49004b0a9c2b60a3b1f5bd12e7f56138

openstack/puppet-openstack-integration,openstack/puppet-openstack-integration,openstack/puppet-openstack-integration