From: Julie Pichon <jpichon@redhat.com>
Date: Fri, 30 Sep 2016 10:32:45 +0000 (+0100)
Subject: Clean out UI httpd configuration file
X-Git-Tag: opnfv-6.0.0~554
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d86516383390f73134b427fe2e4627161840409f;p=apex-puppet-tripleo.git

Clean out UI httpd configuration file

When updating the package with yum directly, a new httpd config file is
created with a different name than the one used by Puppet, causing
httpd to fail. Cleaning out the package config file and keeping it
around means it won't get overwritten on update, and is the way other
projects such as puppet-horizon handle this.

Change-Id: I539729ce4cd0898f8b0f3f26266e4e6d55b99e37
Closes-Bug: #1628983
---

diff --git a/manifests/ui.pp b/manifests/ui.pp
index c73d984..3f6d37a 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -91,6 +91,21 @@ class tripleo::ui (
     fallbackresource => '/index.html',
   }
 
+  # We already use apache::vhost to generate our own
+  # configuration file, let's clean the configuration
+  # embedded within the package
+  file { "${apache::confd_dir}/openstack-tripleo-ui.conf" :
+    ensure  => present,
+    content => "#
+# This file has been cleaned by Puppet.
+#
+# OpenStack TripleO UI configuration has been moved to:
+# - 25-tripleo-ui.conf
+#",
+    require => Package['openstack-tripleo-ui'],
+    before  => Service[$::apache::params::service_name],
+  }
+
   file { '/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js' :
     ensure  => file,
     content => template('tripleo/ui/tripleo_ui_config.js.erb'),