components/ruby/puppet-modules/openstack-nova/patches/05-api.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Wed, 27 Apr 2016 14:55:10 -0700
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
permissions -rw-r--r--
23146903 Puppet and OpenStack modules need modification notices

In-house patch to add support for Solaris 11.3 and 12.0.  This patch
has not yet been submitted upstream due to requirements for 3rd party
CI testing.

--- openstack-nova-6.1.0/manifests/api.pp.orig	2016-04-21 08:29:47.808392108 -0700
+++ openstack-nova-6.1.0/manifests/api.pp	2016-04-21 08:30:04.868712046 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
 # == Class: nova::api
 #
 # Setup and configure the Nova API endpoint
@@ -195,8 +199,8 @@
 
   Nova_paste_api_ini<| |> ~> Exec['post-nova_config']
 
-  Nova_paste_api_ini<| |> ~> Service['nova-api']
-  Class['nova::policy'] ~> Service['nova-api']
+  Nova_paste_api_ini<| |> ~> Service[$::nova::params::api_service_name]
+  Class['nova::policy'] ~> Service[$::nova::params::api_service_name]
 
   if $conductor_workers {
     warning('The conductor_workers parameter is deprecated and has no effect. Use workers parameter of nova::conductor class instead.')