diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-20 16:50:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-20 16:50:29 +0000 |
| commit | b221948fc923b55750e5e64920ca1148cad2fd7d (patch) | |
| tree | 2169ef1ad12664cafbeae0cbf92a6d8bc4d2a680 | |
| parent | 65fe0404ae77364480a545141486d4d606d8119b (diff) | |
| parent | 76b0074c76c067de6e722b7e2a6410ecfcb45fb7 (diff) | |
Merge "Require the UI package when creating the virtual host"
| -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, |