From: Carlos Camacho <ccamacho@redhat.com>
Date: Thu, 15 Jun 2017 09:49:42 +0000 (+0200)
Subject: Require the UI package when creating the virtual host
X-Git-Tag: opnfv-6.0.0~133^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=76b0074c76c067de6e722b7e2a6410ecfcb45fb7;p=apex-puppet-tripleo.git

Require the UI package when creating the virtual host

Quickstart is failing with this error:

Error: Cannot create /var/www/openstack-tripleo-ui/dist;
       parent directory /var/www/openstack-tripleo-ui does not exist
Error: /Stage[main]/Tripleo::Ui/Apache::Vhost[tripleo-ui]/File[/var/www/openstack-tripleo-ui/dist]
       ensure: change from absent to directory
       failed: Cannot create /var/www/openstack-tripleo-ui/dist; parent directory /var/www/openstack-tripleo-ui does not exist

Puppet cant create the folders tree by itself.

Closes-bug: 1698105
Change-Id: I5cce963a6225552f4b7253cb34edc72b392b9dda
---

diff --git a/manifests/profile/base/ui.pp b/manifests/profile/base/ui.pp
index 681496a..710c210 100644
--- a/manifests/profile/base/ui.pp
+++ b/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
 }
 
diff --git a/manifests/ui.pp b/manifests/ui.pp
index 825ffc2..d744044 100644
--- a/manifests/ui.pp
+++ b/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,