Use anchor instead of specific package resource

... to make the manifest more robust with the changes in underlying
modules.

Change-Id: Icf3bf402e694db0f2dcabffbfdfd2f639585e9de

manifests/aodh.pp

@@ -19,7 +19,7 @@ class openstack_integration::aodh (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'aodh':
       notify  => Service['httpd'],
-      require => Package['aodh'],
+      require => Anchor['aodh::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/barbican.pp

@@ -11,7 +11,7 @@ class openstack_integration::barbican {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'barbican':
       notify  => Service['httpd'],
-      require => Package['barbican-api'],
+      require => Anchor['barbican::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/cinder.pp

@@ -36,7 +36,7 @@ class openstack_integration::cinder (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'cinder':
       notify  => Service['httpd'],
-      require => Package['cinder'],
+      require => Anchor['cinder::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/designate.pp

@@ -15,7 +15,7 @@ class openstack_integration::designate (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'designate':
       notify  => Service['httpd'],
-      require => Package['designate-common'],
+      require => Anchor['designate::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/gnocchi.pp

@@ -14,7 +14,7 @@ class openstack_integration::gnocchi (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'gnocchi':
       notify  => Service['httpd'],
-      require => Package['gnocchi'],
+      require => Anchor['gnocchi::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/heat.pp

@@ -18,15 +18,10 @@ class openstack_integration::heat (
 
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'heat':
-      require => Package['heat-common'],
+      notify  => Service['httpd'],
+      require => Anchor['heat::install::end'],
     }
-    $key_file = "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem"
+    Exec['update-ca-certificates'] ~> Service['httpd']
-    $crt_file = $::openstack_integration::params::cert_path
-    File[$key_file] ~> Service<| tag == 'heat-service' |>
-    Exec['update-ca-certificates'] ~> Service<| tag == 'heat-service' |>
-  } else {
-    $key_file = undef
-    $crt_file = undef
   }
 
   class { 'heat::keystone::authtoken':
@@ -114,8 +109,8 @@ class openstack_integration::heat (
   class { 'heat::wsgi::apache_api':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,
-    ssl_cert  => $crt_file,
+    ssl_cert  => $::openstack_integration::params::cert_path,
-    ssl_key   => $key_file,
+    ssl_key   => "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem",
     workers   => 2,
   }
   class { 'heat::engine':
@@ -130,8 +125,8 @@ class openstack_integration::heat (
   class { 'heat::wsgi::apache_api_cfn':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,
-    ssl_cert  => $crt_file,
+    ssl_cert  => $::openstack_integration::params::cert_path,
-    ssl_key   => $key_file,
+    ssl_key   => "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem",
     workers   => 2,
   }
   class { 'heat::cron::purge_deleted': }

manifests/ironic.pp

@@ -25,11 +25,11 @@ class openstack_integration::ironic (
 
     openstack_integration::ssl_key { 'ironic':
       notify  => Service['httpd'],
-      require => Package['ironic-common'],
+      require => Anchor['ironic::install::end'],
     }
     openstack_integration::ssl_key { 'ironic-inspector':
       notify  => Service['httpd'],
-      require => Package['ironic-inspector'],
+      require => Anchor['ironic-inspector::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/keystone.pp

@@ -33,7 +33,7 @@ class openstack_integration::keystone (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'keystone':
       notify  => Service['httpd'],
-      require => Package['keystone'],
+      require => Anchor['keystone::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/magnum.pp

@@ -21,7 +21,7 @@ class openstack_integration::magnum (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'magnum':
       notify  => Service['httpd'],
-      require => Package['magnum-common'],
+      require => Anchor['magnum::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/manila.pp

@@ -25,7 +25,7 @@ class openstack_integration::manila (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'manila':
       notify  => Service['httpd'],
-      require => Package['manila'],
+      require => Anchor['manila::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/mistral.pp

@@ -10,7 +10,7 @@ class openstack_integration::mistral {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'mistral':
       notify  => Service['httpd'],
-      require => Package['mistral-common'],
+      require => Anchor['mistral::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/nova.pp

@@ -52,7 +52,7 @@ class openstack_integration::nova (
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'nova':
       notify  => Service['httpd'],
-      require => Package['nova-common'],
+      require => Anchor['nova::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/placement.pp

@@ -10,7 +10,7 @@ class openstack_integration::placement {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'placement':
       notify  => Service['httpd'],
-      require => Package['placement-common'],
+      require => Anchor['placement::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/swift.pp

@@ -122,7 +122,7 @@ class openstack_integration::swift {
     ensure  => directory,
     owner   => 'swift',
     group   => 'swift',
-    require => Package['swift'],
+    require => Anchor['swift::install::end'],
   }
   # Create 3 directories under /srv/node for 3 devices
   [1, 2, 3].each | $device | {

manifests/trove.pp

@@ -11,7 +11,7 @@ class openstack_integration::trove {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'trove':
       notify  => Service['httpd'],
-      require => Package['trove'],
+      require => Anchor['trove::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/vitrage.pp

@@ -11,7 +11,7 @@ class openstack_integration::vitrage {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'vitrage':
       notify  => Service['httpd'],
-      require => Package['vitrage'],
+      require => Anchor['vitrage::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/watcher.pp

@@ -11,7 +11,7 @@ class openstack_integration::watcher {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'watcher':
       notify  => Service['httpd'],
-      require => Package['watcher'],
+      require => Anchor['watcher::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }

manifests/zaqar.pp

@@ -5,7 +5,7 @@ class openstack_integration::zaqar {
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'zaqar':
       notify  => Service['httpd'],
-      require => Package['zaqar-common'],
+      require => Anchor['zaqar::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }