openstack/puppet-tripleo
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-06-20 16:50:29 +00:00 committed by Gerrit Code Review
commit b221948fc9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/ui.pp
View File

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

3
manifests/ui.pp
View File

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