From 32348b3a1159c140513041db7ff55fc32417eb00 Mon Sep 17 00:00:00 2001
From: Adam Spiers <aspiers@suse.com>
Date: Thu, 17 Mar 2016 19:24:00 +0000
Subject: [PATCH] os_password is no longer a mandatory option

neutron-ha-tool.py is now being maintained in the
neutron-ha-tool-maintenance branch of this fork:

  https://github.com/SUSE-Cloud/cookbook-openstack-network/

One of the new changes in that branch is the option to obtain
os_password from /etc/neutron/os_password instead of from the Pacemaker
CIB.  This is more secure and also avoids quoting issues with crmsh when
the password has unusual characters:

  https://github.com/SUSE-Cloud/cookbook-openstack-network/commit/29e97599370f00414ceafae8dd4221f55de7be20

When we are using that approach, os_password is not set on the
primitive, so we change this parameter to no longer be required,
in order to avoid warnings from crm_verify etc.

Change-Id: I6cd675fc744c7cfb444bf524c6d6d6444f8e4368
Signed-off-by: Adam Spiers <aspiers@suse.com>
---
 ocf/neutron-ha-tool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocf/neutron-ha-tool b/ocf/neutron-ha-tool
index 5bc6c21..a99961a 100644
--- a/ocf/neutron-ha-tool
+++ b/ocf/neutron-ha-tool
@@ -123,7 +123,7 @@ The region name to use for authentication against keystone.
 <content type="string" default="${OCF_RESKEY_os_region_name_default}" />
 </parameter>
 
-<parameter name="os_password" unique="0" required="1">
+<parameter name="os_password" unique="0" required="0">
 <longdesc lang="en">
 The password to use for authentication against keystone.
 </longdesc>