1 In-house patch to remove /usr/lib64/heat, /usr/local/lib/heat, and |
1 In-house patch to remove /usr/lib64/heat, /usr/local/lib/heat, and |
2 /usr/local/lib64/heat from the default list of plugin directories |
2 /usr/local/lib64/heat from the default list of plugin directories |
3 searched by Heat. This patch is Solaris specific and not suitable for |
3 searched by Heat. This patch is Solaris specific and not suitable for |
4 upstream contribution. |
4 upstream contribution. |
5 |
5 |
6 --- heat-2015.1.2/heat/common/config.py.~1~ 2015-10-13 09:51:53.000000000 -0700 |
6 --- heat-6.0.0/heat/common/config.py.~1~ 2016-04-07 00:37:15.000000000 -0700 |
7 +++ heat-2015.1.2/heat/common/config.py 2016-01-28 01:27:19.707862313 -0800 |
7 +++ heat-6.0.0/heat/common/config.py 2016-06-10 14:59:42.624070450 -0700 |
8 @@ -97,8 +97,7 @@ engine_opts = [ |
8 @@ -88,8 +88,7 @@ service_opts = [ |
9 "with your cloud image (for OS::Nova::Server) or " |
9 |
10 "'ec2-user' (for AWS::EC2::Instance).")), |
10 engine_opts = [ |
11 cfg.ListOpt('plugin_dirs', |
11 cfg.ListOpt('plugin_dirs', |
12 - default=['/usr/lib64/heat', '/usr/lib/heat', |
12 - default=['/usr/lib64/heat', '/usr/lib/heat', |
13 - '/usr/local/lib/heat', '/usr/local/lib64/heat'], |
13 - '/usr/local/lib/heat', '/usr/local/lib64/heat'], |
14 + default=['/usr/lib/heat'], |
14 + default=['/usr/lib/heat'], |
15 help=_('List of directories to search for plug-ins.')), |
15 help=_('List of directories to search for plug-ins.')), |