x/openstack-resource-agents
Code Issues Proposed changes

NovaCompute: Support parsing host option from /etc/nova/nova.conf.d

Browse Source 
Change-Id: Ic08f05d217e1321ee7d3feec4d12bf32593e7982
This commit is contained in:
Vincent Untz 2017-01-30 15:55:24 +01:00
parent 7a01081e73
commit fe84d75954
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ocf/NovaCompute
View File

@ -324,8 +324,23 @@ nova_validate() {
# or configured in nova.conf # or configured in nova.conf
local validate_host=1 local validate_host=1
NOVA_HOST=$(crudini --get /etc/nova/nova.conf DEFAULT host 2>/dev/null) local conf_file
if [ $? = 1 ]; then 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 if [ "x${OCF_RESKEY_domain}" != x ]; then
NOVA_HOST=$(uname -n | awk -F. '{print $1}') NOVA_HOST=$(uname -n | awk -F. '{print $1}')
else else