From 5dd27aca8c2ce7ebc9b6c85a0b038779965e232f Mon Sep 17 00:00:00 2001
From: Ivan Udovichenko <iudovichenko@mirantis.com>
Date: Thu, 10 Nov 2016 19:47:37 +0300
Subject: [PATCH] Add glare-db-sync call before service start up and fix minor
 issues

glare-db-sync should be called before the service
start up and right after package installation.

Remove default vhost completely.

Change-Id: I6e07f99a69b8beedac49edd1cf8f551ebb5c569d
---
 manifests/plugins/glare.pp | 17 ++++++++++++++---
 manifests/wsgi/apache.pp   |  2 --
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/manifests/plugins/glare.pp b/manifests/plugins/glare.pp
index 61b0016..9feab58 100644
--- a/manifests/plugins/glare.pp
+++ b/manifests/plugins/glare.pp
@@ -11,6 +11,7 @@ class apps_site::plugins::glare (
   $ssl_cert_file_location    = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
   $ssl_key_file_location     = '/etc/ssl/private/ssl-cert-snakeoil.key',
   $ssl_ca_file_location      = '/etc/ssl/certs/ca-certificates.crt',
+  $extra_params              = '--config-file /usr/local/etc/glare/glare.conf'
 ) inherits ::apps_site::params {
 
   package { 'glare_dev':
@@ -21,12 +22,22 @@ class apps_site::plugins::glare (
   service { 'glare-api':
     ensure   => 'running',
     provider => base,
-    start    => 'nohup /usr/local/bin/glare-api --config-file /usr/local/etc/glare/glare.conf &',
-    restart  => 'killall glare-api; nohup /usr/local/bin/glare-api --config-file /usr/local/etc/glare/glare.conf &',
+    start    => "nohup glare-api ${extra_params} &",
+    restart  => "killall glare-api; nohup glare-api ${extra_params} &",
     stop     => 'killall glare-api',
   }
 
-  Package['glare_dev'] -> Service['glare-api']
+  exec { 'glare-db-sync':
+    command     => "glare-db-manage ${extra_params} upgrade",
+    path        => [ '/bin/', '/usr/bin/' , '/usr/local/bin' ],
+    refreshonly => true,
+    try_sleep   => 5,
+    tries       => 10,
+    logoutput   => on_failure,
+  }
+
+  Package['glare_dev'] ~> Exec['glare-db-sync'] -> Service['glare-api']
+
 #  include ::glare::params
 #  include ::glare::db::sync
 #
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index c15e4ac..5b67e2f 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -16,9 +16,7 @@ class apps_site::wsgi::apache (
 ) inherits ::apps_site::params {
 
   class { '::apache':
-    mpm_module    => false,
     default_vhost => false,
-    purge_configs => false,
   }
 
   if $use_ssl {