1 In-house patch to remove /usr/lib64/heat from the default list of |
1 In-house patch to remove /usr/lib64/heat from the default list of |
2 plugin directories searched by Heat. This patch is Solaris specific |
2 plugin directories searched by Heat. This patch is Solaris specific |
3 and not suitable for upstream contribution. |
3 and not suitable for upstream contribution. |
4 |
4 |
5 --- heat-2013.2.3/heat/common/config.py.orig 2014-07-17 12:48:08.249427463 -0600 |
5 --- heat-2014.2.2/heat/common/config.py.~1~ 2014-12-04 21:02:30.000000000 -0800 |
6 +++ heat-2013.2.3/heat/common/config.py 2014-07-17 12:48:31.499385628 -0600 |
6 +++ heat-2014.2.2/heat/common/config.py 2014-12-13 13:31:30.350162153 -0800 |
7 @@ -85,7 +85,7 @@ |
7 @@ -94,7 +94,7 @@ engine_opts = [ |
8 default='heat.engine.nova', |
8 default='heat.engine.nova', |
9 help='Driver to use for controlling instances'), |
9 help='Driver to use for controlling instances.'), |
10 cfg.ListOpt('plugin_dirs', |
10 cfg.ListOpt('plugin_dirs', |
11 - default=['/usr/lib64/heat', '/usr/lib/heat'], |
11 - default=['/usr/lib64/heat', '/usr/lib/heat'], |
12 + default=['/usr/lib/heat'], |
12 + default=['/usr/lib/heat'], |
13 help='List of directories to search for Plugins'), |
13 help='List of directories to search for plug-ins.'), |
14 cfg.StrOpt('environment_dir', |
14 cfg.StrOpt('environment_dir', |
15 default='/etc/heat/environment.d', |
15 default='/etc/heat/environment.d', |