Merge "Refactor dependency management of apache"

manifests/init.pp

@@ -687,6 +687,7 @@ Support for deploying under eventlet will be dropped as of the M-release of Open
     'httpd': {
       include apache::params
       $service_name_real = $::apache::params::service_name
+      Service <| title == 'httpd' |> { tag +> 'keystone-service' }
     }
     default: {
       fail("Invalid service_name. Either keystone/openstack-keystone for \

manifests/wsgi/apache.pp

@@ -172,30 +172,6 @@ class keystone::wsgi::apache (
 
   include keystone::deps
 
-  # TODO(tobias-urdin): This dependency chaining can be moved to keystone::deps
-  # when we have cleaned up some old eventlet code and users are forced to use
-  # apache even though it's pretty much enforced today.
-
-  # The httpd package is untagged, but needs to have ordering enforced,
-  # so handle it here rather than in the deps class.
-  Anchor['keystone::install::begin']
-  -> Package['httpd']
-  -> Anchor['keystone::install::end']
-
-  # Configure apache during the config phase
-  Anchor['keystone::config::begin']
-  -> Apache::Vhost<||>
-  ~> Anchor['keystone::config::end']
-
-  # Start the service during the service phase
-  Anchor['keystone::service::begin']
-  -> Service['httpd']
-  -> Anchor['keystone::service::end']
-
-  # Notify the service when config changes
-  Anchor['keystone::config::end']
-  ~> Service['httpd']
-
   ::openstacklib::wsgi::apache { 'keystone_wsgi':
     servername                  => $servername,
     bind_host                   => $bind_host,