Merge "Require the UI package when creating the virtual host"

manifests/profile/base/ui.pp

@@ -17,10 +17,6 @@
 # UI profile for tripleo
 #
 class tripleo::profile::base::ui () {
-  package {'openstack-tripleo-ui': }
-
-  include ::apache
-
   include ::tripleo::ui
 }
 

manifests/ui.pp

@@ -136,13 +136,16 @@ class tripleo::ui (
   $endpoint_config_swift            = undef,
 
 ) {
+  package {'openstack-tripleo-ui': }
 
+  include ::apache
   include ::apache::mod::proxy
   include ::apache::mod::proxy_http
   include ::apache::mod::proxy_wstunnel
 
   ::apache::vhost { 'tripleo-ui':
     ensure           => 'present',
+    require          => Package['openstack-tripleo-ui'],
     servername       => $servername,
     ip               => $bind_host,
     port             => $ui_port,