Comment 5 for bug 1348728

Reviewed: https://review.openstack.org/136885
Committed: https://git.openstack.org/cgit/stackforge/puppet-keystone/commit/?id=bab7304c88a065aa3f4d3a970d82abdb65cb9169
Submitter: Jenkins
Branch: stable/icehouse

commit bab7304c88a065aa3f4d3a970d82abdb65cb9169
Author: Rich Megginson <email address hidden>
Date: Thu Jul 17 16:22:34 2014 -0600

    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