Adds Support for Recent Puppet Module Refactor

The puppet-openshift_origin module recently went through a
refactor in preperation for the v4 OSO release.  This patch
changes the necessary puppet parameters for the template to
continue functioning.

Change-Id: Ia9145ebf744e45ee3c7341a04f05d257515a976d
Merge "Adds Support for Recent Puppet Module Refactor"