From: Alex Schultz <aschultz@mirantis.com>
Date: Fri, 13 May 2016 16:10:18 +0000 (-0600)
Subject: Update keystone service name for signing keys
X-Git-Tag: opnfv-6.0.0~769
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=19e161cd73fd7064b1732b4100cd9cc28768a092;p=apex-puppet-tripleo.git

Update keystone service name for signing keys

Since keystone is being run under apache, the signing keys should notify
apache and not the keystone service.  The keystone service is actually
disabled, so if the keys get updated nothing happens.

Change-Id: Idfebeabf03d010956569c32b24437245e2b93c2a
Related-Bug: #1581591
---

diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 2f7a27a..5d51e5e 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -96,21 +96,21 @@ class tripleo::profile::base::keystone (
       content => hiera('keystone_signing_certificate'),
       owner   => 'keystone',
       group   => 'keystone',
-      notify  => Service['keystone'],
+      notify  => Service[$::apache::params::service_name],
       require => File['/etc/keystone/ssl/certs'],
     }
     file { '/etc/keystone/ssl/private/signing_key.pem':
       content => hiera('keystone_signing_key'),
       owner   => 'keystone',
       group   => 'keystone',
-      notify  => Service['keystone'],
+      notify  => Service[$::apache::params::service_name],
       require => File['/etc/keystone/ssl/private'],
     }
     file { '/etc/keystone/ssl/certs/ca.pem':
       content => hiera('keystone_ca_certificate'),
       owner   => 'keystone',
       group   => 'keystone',
-      notify  => Service['keystone'],
+      notify  => Service[$::apache::params::service_name],
       require => File['/etc/keystone/ssl/certs'],
     }
   }