From c3eee8522893359f70d5c3758ce9a236eee072c3 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Sat, 21 Nov 2015 02:09:00 +0000 Subject: [PATCH] Use crudini instead of openstack-config openstack-config has been superseded by crudini, e.g. https://github.com/redhat-openstack/openstack-utils/commit/5f55639cd5 Change-Id: I19302403d9d9bc8caea7fb3869ce668ff5c40919 Signed-off-by: Adam Spiers --- ocf/NovaCompute | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocf/NovaCompute b/ocf/NovaCompute index 3f58acb..8032c6a 100644 --- a/ocf/NovaCompute +++ b/ocf/NovaCompute @@ -250,7 +250,7 @@ nova_validate() { rc=$OCF_SUCCESS fence_options="" - check_binary openstack-config + check_binary crudini check_binary nova-compute if [ ! -f /etc/nova/nova.conf ]; then @@ -310,7 +310,7 @@ nova_validate() { # we take a chance here and hope that host is either not configured # or configured in nova.conf - NOVA_HOST=$(openstack-config --get /etc/nova/nova.conf DEFAULT host 2>/dev/null) + NOVA_HOST=$(crudini --get /etc/nova/nova.conf DEFAULT host 2>/dev/null) if [ $? = 1 ]; then if [ "x${OCF_RESKEY_domain}" != x ]; then NOVA_HOST=$(uname -n | awk -F. '{print $1}') @@ -320,7 +320,7 @@ nova_validate() { fi # We only need to check a configured value, calculated ones are fine - openstack-config --get /etc/nova/nova.conf DEFAULT host 2>/dev/null + crudini --get /etc/nova/nova.conf DEFAULT host 2>/dev/null if [ $? = 0 ]; then if [ "x${OCF_RESKEY_domain}" != x ]; then short_host=$(uname -n | awk -F. '{print $1}')