fix apache::vhost concat test breakage

We do not need to verify the contents of the file that apache::vhost
(via concat) generates, so just skip it.

Closes-Bug: #1392499
(cherry picked from commit c38e7a619b0cbde3c381d15bbceb4a06e2b048bb)

Change-Id: Ic765fd12e1fe69e35cc021457769b684b5897178
setup keystone using apache mod_wsgi

Allow keystone to be set up to use apache mod_wsgi as the server
instead of a standalone eventlet service.  There is a new keystone
class parameter: service_name.  The default is 'keystone', which will
set up the standalone eventlet service.  If 'httpd' is used, the
keystone class will skip creating the keystone service, which also means
no 'openstack-keystone' service.  The class 'keystone::wsgi::apache' is
then used to configure apache mod_wsgi to serve keystone.

Had to remove the File resource default in the keystone class.  When
using wsgi::apache, the apache class and other classes are included.
Since puppet uses dynamic scoping, this overrides the file resources
in those classes as well.  keystone now explicitly sets all of the
parameters in files/directory resources.

Closes-Bug: #1348728
(cherry picked from commit 879f87270a8fbc861d55b8e31388c2c97028711a)

Conflicts:
	manifests/init.pp
	manifests/params.pp
	spec/classes/keystone_spec.rb

Change-Id: Ia228cb3c582c2890f35e1f0ee11e0fef69179523