Merge "Paremeter for plugin dirs"
diff --git a/heat/files/juno/heat.conf.Debian b/heat/files/juno/heat.conf.Debian
index 1f4a37f..ccb1503 100644
--- a/heat/files/juno/heat.conf.Debian
+++ b/heat/files/juno/heat.conf.Debian
@@ -27,7 +27,9 @@
#instance_driver=heat.engine.nova
# List of directories to search for plug-ins. (list value)
-#plugin_dirs=/usr/lib64/heat,/usr/lib/heat
+{%- if server.get('dir', {}).plugins is defined %}
+plugin_dirs={{ server.dir.plugins|join(",") }}
+{%- endif %}
# The directory to search for environment files. (string
# value)
diff --git a/heat/files/kilo/heat.conf.Debian b/heat/files/kilo/heat.conf.Debian
index 75209d2..1b6ba83 100644
--- a/heat/files/kilo/heat.conf.Debian
+++ b/heat/files/kilo/heat.conf.Debian
@@ -27,6 +27,12 @@
# Please use logging_context_format_string and logging_default_format_string
# instead. (string value)
#log_format = <None>
+
+# List of directories to search for plug-ins. (list value)
+{%- if server.get('dir', {}).plugins is defined %}
+plugin_dirs={{ server.dir.plugins|join(",") }}
+{%- endif %}
+
heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
# URL of the Heat waitcondition server. (string value)
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 22d07ab..6524520 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -27,6 +27,12 @@
# Please use logging_context_format_string and logging_default_format_string
# instead. (string value)
#log_format = <None>
+
+# List of directories to search for plug-ins. (list value)
+{%- if server.get('dir', {}).plugins is defined %}
+plugin_dirs={{ server.dir.plugins|join(",") }}
+{%- endif %}
+
heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
# URL of the Heat waitcondition server. (string value)
diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index 0c31202..8b40a90 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -27,6 +27,12 @@
# Please use logging_context_format_string and logging_default_format_string
# instead. (string value)
#log_format = <None>
+
+# List of directories to search for plug-ins. (list value)
+{%- if server.get('dir', {}).plugins is defined %}
+plugin_dirs={{ server.dir.plugins|join(",") }}
+{%- endif %}
+
heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
# URL of the Heat waitcondition server. (string value)
diff --git a/heat/files/mitaka/heat.conf.RedHat b/heat/files/mitaka/heat.conf.RedHat
index 2d55c92..7f2a7ad 100644
--- a/heat/files/mitaka/heat.conf.RedHat
+++ b/heat/files/mitaka/heat.conf.RedHat
@@ -27,6 +27,12 @@
# Please use logging_context_format_string and logging_default_format_string
# instead. (string value)
#log_format = <None>
+
+# List of directories to search for plug-ins. (list value)
+{%- if server.get('dir', {}).plugins is defined %}
+plugin_dirs={{ server.dir.plugins|join(",") }}
+{%- endif %}
+
heat_metadata_server_url=http://{{ server.metadata.host }}:{{ server.metadata.port }}
# URL of the Heat waitcondition server. (string value)
diff --git a/tests/pillar/server_plugin_dirs.sls b/tests/pillar/server_plugin_dirs.sls
new file mode 100644
index 0000000..2ece784
--- /dev/null
+++ b/tests/pillar/server_plugin_dirs.sls
@@ -0,0 +1,50 @@
+heat:
+ server:
+ enabled: true
+ region: RegionOne
+ version: liberty
+ stack_domain_admin:
+ name: heat_domain_admin
+ password: password
+ domain: heat
+ bind:
+ api_cfn:
+ address: 0.0.0.0
+ api_cloudwatch:
+ address: 0.0.0.0
+ api:
+ address: 127.0.0.1
+ database:
+ engine: mysql
+ host: 127.0.0.1
+ port: 3306
+ name: heat
+ user: heat
+ password: password
+ metadata:
+ host: 127.0.0.1
+ port: 8000
+ waitcondition:
+ host: 127.0.0.1
+ port: 8000
+ watch:
+ host: 127.0.0.1
+ port: 8003
+ identity:
+ engine: keystone
+ host: 127.0.0.1
+ port: 35357
+ tenant: service
+ user: heat
+ password: password
+ message_queue:
+ engine: rabbitmq
+ host: 127.0.0.1
+ port: 5672
+ user: openstack
+ password: password
+ virtual_host: '/openstack'
+ dir:
+ plugins:
+ - /test/dir1
+ - /test/dir2