diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2017-06-15 11:49:42 +0200 |
|---|---|---|
| committer | Carlos Camacho <ccamacho@redhat.com> | 2017-06-19 18:10:24 +0200 |
| commit | 76b0074c76c067de6e722b7e2a6410ecfcb45fb7 (patch) | |
| tree | 028c95ad9690fe1bdd115e43961b900fd87da93b /manifests | |
| parent | d0970575cd315adad50b42051e96972b34de6e88 (diff) | |
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
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/ui.pp | 4 | ||||
| -rw-r--r-- | manifests/ui.pp | 3 |
2 files changed, 3 insertions, 4 deletions
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, |