From b3713738998003c2b70d8eba41626d38ed3c0745 Mon Sep 17 00:00:00 2001
From: EmilienM <root@folsom-controller.(none)>
Date: Thu, 13 Sep 2012 08:00:23 +0000
Subject: [PATCH] Folsom update

---
 ocf/nova-cert        | 2 +-
 ocf/nova-consoleauth | 2 +-
 ocf/nova-novnc       | 2 +-
 ocf/nova-scheduler   | 2 +-
 ocf/nova-volume      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ocf/nova-cert b/ocf/nova-cert
index febf682..0c0b117 100644
--- a/ocf/nova-cert
+++ b/ocf/nova-cert
@@ -287,7 +287,7 @@ nova_cert_start() {
 
     # run the actual nova-cert daemon. Don't use ocf_run as we're sending the tool's output
     # straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
-    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --flagfile=$OCF_RESKEY_config \
+    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
        $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
 
     # Spin waiting for the server to come up.
diff --git a/ocf/nova-consoleauth b/ocf/nova-consoleauth
index fb5ec1b..80aeec9 100644
--- a/ocf/nova-consoleauth
+++ b/ocf/nova-consoleauth
@@ -287,7 +287,7 @@ nova_consoleauth_start() {
 
     # run the actual nova-consoleauth daemon. Don't use ocf_run as we're sending the tool's output
     # straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
-    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --flagfile=$OCF_RESKEY_config \
+    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
        $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
 
     # Spin waiting for the server to come up.
diff --git a/ocf/nova-novnc b/ocf/nova-novnc
index cd0740f..41dc49a 100644
--- a/ocf/nova-novnc
+++ b/ocf/nova-novnc
@@ -236,7 +236,7 @@ nova_vnc_console_start() {
 
     # run the actual nova-novncproxy daemon. Don't use ocf_run as we're sending the tool's output
     # straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
-    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --flagfile=$OCF_RESKEY_config --web /usr/share/novnc/ \
+    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config --web /usr/share/novnc/ \
        $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
 
     # Spin waiting for the server to come up.
diff --git a/ocf/nova-scheduler b/ocf/nova-scheduler
index e878bc1..ec31daa 100644
--- a/ocf/nova-scheduler
+++ b/ocf/nova-scheduler
@@ -286,7 +286,7 @@ nova_scheduler_start() {
 
     # run the actual nova-scheduler daemon. Don't use ocf_run as we're sending the tool's output
     # straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
-    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --flagfile=$OCF_RESKEY_config \
+    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
        $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
 
     # Spin waiting for the server to come up.
diff --git a/ocf/nova-volume b/ocf/nova-volume
index 9185a22..4dad26d 100644
--- a/ocf/nova-volume
+++ b/ocf/nova-volume
@@ -265,7 +265,7 @@ nova_volume_start() {
 
     # run the actual nova-volume daemon. Don't use ocf_run as we're sending the tool's output
     # straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
-    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --flagfile=$OCF_RESKEY_config \
+    su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
        $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
 
     # Spin waiting for the server to come up.