From 9fe15199213722ca7759a608a0022434470cb728 Mon Sep 17 00:00:00 2001
From: Michael Davies <michael@the-davies.net>
Date: Mon, 30 Nov 2015 20:21:46 +1030
Subject: [PATCH] Adding config file as option to ironic upstart

---
 templates/ironic-upstart-init.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/ironic-upstart-init.j2 b/templates/ironic-upstart-init.j2
index 156c0bc6..3a3f36d4 100644
--- a/templates/ironic-upstart-init.j2
+++ b/templates/ironic-upstart-init.j2
@@ -13,6 +13,7 @@ respawn limit 10 5
 
 # Set the RUNBIN environment variable
 env RUNBIN="{{ ironic_bin }}/{{ program_name }}"
+env RUNOPTS="--config-file /etc/ironic/ironic.conf"
 
 # Change directory to service users home
 chdir "{{ service_home }}"
@@ -42,5 +43,6 @@ exec start-stop-daemon --start \
                        --make-pidfile \
                        --pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \
                        --exec "{{ program_override|default('$RUNBIN') }}" \
-                       -- {{ program_config_options|default('') }} \
+                       -- {{ program_config_options|default('$RUNOPTS') }} \
                        --log-file={{ ironic_system_log_folder }}/{{ program_name }}.log
+