1 In-house patch to remove /usr/lib64/heat from the default list of |
1 In-house patch to remove /usr/lib64/heat, /usr/local/lib/heat, and |
2 plugin directories searched by Heat. This patch is Solaris specific |
2 /usr/local/lib64/heat from the default list of plugin directories |
3 and not suitable for upstream contribution. |
3 searched by Heat. This patch is Solaris specific and not suitable for |
|
4 upstream contribution. |
4 |
5 |
5 --- heat-2014.2.2/heat/common/config.py.~1~ 2014-12-04 21:02:30.000000000 -0800 |
6 --- heat-2015.1.2/heat/common/config.py.~1~ 2015-10-13 09:51:53.000000000 -0700 |
6 +++ heat-2014.2.2/heat/common/config.py 2014-12-13 13:31:30.350162153 -0800 |
7 +++ heat-2015.1.2/heat/common/config.py 2016-01-28 01:27:19.707862313 -0800 |
7 @@ -94,7 +94,7 @@ engine_opts = [ |
8 @@ -97,8 +97,7 @@ engine_opts = [ |
8 default='heat.engine.nova', |
9 "with your cloud image (for OS::Nova::Server) or " |
9 help='Driver to use for controlling instances.'), |
10 "'ec2-user' (for AWS::EC2::Instance).")), |
10 cfg.ListOpt('plugin_dirs', |
11 cfg.ListOpt('plugin_dirs', |
11 - default=['/usr/lib64/heat', '/usr/lib/heat'], |
12 - default=['/usr/lib64/heat', '/usr/lib/heat', |
|
13 - '/usr/local/lib/heat', '/usr/local/lib64/heat'], |
12 + default=['/usr/lib/heat'], |
14 + default=['/usr/lib/heat'], |
13 help='List of directories to search for plug-ins.'), |
15 help=_('List of directories to search for plug-ins.')), |
14 cfg.StrOpt('environment_dir', |
16 cfg.StrOpt('environment_dir', |
15 default='/etc/heat/environment.d', |
17 default='/etc/heat/environment.d', |