Merge "Fix broken acceptance tests"

manifests/vhost.pp

@@ -22,11 +22,12 @@ class openstack_health::vhost(
   $frontend_dir = "${openstack_health::source_dir}/build"
 
   httpd::vhost { "${vhost_name}-frontend":
-    docroot  => 'MEANINGLESS ARGUMENT',
-    port     => $vhost_port,
-    priority => '100',
-    ssl      => false,
-    template => 'openstack_health/openstack-health-frontend.vhost.erb',
-    require  => Exec['build-static-files'],
+    docroot    => 'MEANINGLESS ARGUMENT',
+    vhost_name => $vhost_name,
+    port       => $vhost_port,
+    priority   => '100',
+    ssl        => false,
+    template   => 'openstack_health/openstack-health-frontend.vhost.erb',
+    require    => Exec['build-static-files'],
   }
 }

spec/acceptance/fixtures/frontend.pp

@@ -4,9 +4,8 @@ class { '::openstack_health':
   source_dir => $source_dir,
 }
 
-class { '::openstack_health::frontend':
-  source_dir   => '/opt/openstack-health',
-  serveradmin  => 'webmaster@localhost',
+class { '::openstack_health::vhost':
+  serveradmin  => "webmaster@${::fqdn}",
   vhost_name   => 'localhost',
   vhost_port   => 80,
   api_endpoint => 'http://localhost:5000',

templates/openstack-health-frontend.vhost.erb

@@ -1,20 +1,20 @@
-<% unless [443, 80].include?(scope.lookupvar("openstack_health::frontend::vhost_port").to_i) %>
-Listen <%= scope.lookupvar("openstack_health::frontend::vhost_port") %>
+<% unless [443, 80].include?(@vhost_port.to_i) %>
+Listen <%= @vhost_port %>
 <% end %>
-<VirtualHost *:<%= scope.lookupvar("openstack_health::frontend::vhost_port") %>>
-  ServerName <%= scope.lookupvar("openstack_health::frontend::vhost_name") %>
-  ServerAdmin <%= scope.lookupvar("openstack_health::frontend::serveradmin") %>
+<VirtualHost *:<%= @vhost_port %>>
+  ServerName <%= @vhost_name %>
+  ServerAdmin <%= @serveradmin %>
 
   LogLevel info
   CustomLog ${APACHE_LOG_DIR}/openstack-health-frontend-access.log combined
   ErrorLog ${APACHE_LOG_DIR}/openstack-health-frontend-error.log
 
-  <Directory <%= scope.lookupvar("openstack_health::frontend::frontend_dir") %>>
+  <Directory <%= @frontend_dir %>>
     Order allow,deny
     Allow from all
     Require all granted
   </Directory>
 
-  DocumentRoot <%= scope.lookupvar("openstack_health::frontend::frontend_dir") %>
+  DocumentRoot <%= @frontend_dir %>
   DirectoryIndex index.html
 </VirtualHost>