From fe84d759544956f5e617ff6619b6b1ea34436637 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Mon, 30 Jan 2017 15:55:24 +0100
Subject: [PATCH] NovaCompute: Support parsing host option from
 /etc/nova/nova.conf.d

Change-Id: Ic08f05d217e1321ee7d3feec4d12bf32593e7982
---
 ocf/NovaCompute | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ocf/NovaCompute b/ocf/NovaCompute
index a90d6f4..45b2bd6 100644
--- a/ocf/NovaCompute
+++ b/ocf/NovaCompute
@@ -324,8 +324,23 @@ nova_validate() {
     # or configured in nova.conf
 
     local validate_host=1
-    NOVA_HOST=$(crudini --get /etc/nova/nova.conf DEFAULT host 2>/dev/null)
-    if [ $? = 1 ]; then
+    local conf_file
+    NOVA_HOST=
+
+    for conf_file in /etc/nova/nova.conf /etc/nova/nova.conf.d/*; do
+        local parsed_value
+
+        if [ ! -f "$conf_file" ]; then
+            continue
+        fi
+
+        parsed_value=$(crudini --get "$conf_file" DEFAULT host 2>/dev/null)
+        if [ $? = 0 ]; then
+            NOVA_HOST="$parsed_value"
+        fi
+    done
+
+    if [ -z "$NOVA_HOST" ]; then
         if [ "x${OCF_RESKEY_domain}" != x ]; then
             NOVA_HOST=$(uname -n | awk -F. '{print $1}')
         else