58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
---
|
|
ocf/nova-novnc | 8 +++-----
|
|
ocf/neutron-agent-dhcp | 2 +-
|
|
ocf/neutron-agent-l3 | 2 +-
|
|
ocf/neutron-server | 2 +-
|
|
4 files changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
--- a/ocf/neutron-agent-dhcp
|
|
+++ b/ocf/neutron-agent-dhcp
|
|
@@ -95,7 +95,7 @@ Location of the OpenStack Quantum Servic
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
-<parameter name="plugin config" unique="0" required="0">
|
|
+<parameter name="plugin_config" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
Location of the OpenStack DHCP Service (neutron-dhcp-agent) configuration file
|
|
</longdesc>
|
|
--- a/ocf/neutron-agent-l3
|
|
+++ b/ocf/neutron-agent-l3
|
|
@@ -95,7 +95,7 @@ Location of the OpenStack Quantum Servic
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
-<parameter name="plugin config" unique="0" required="0">
|
|
+<parameter name="plugin_config" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
Location of the OpenStack L3 Service (neutron-l3-agent) configuration file
|
|
</longdesc>
|
|
--- a/ocf/neutron-server
|
|
+++ b/ocf/neutron-server
|
|
@@ -101,7 +101,7 @@ Location of the OpenStack Quantum Server
|
|
<content type="string" default="${OCF_RESKEY_config_default}" />
|
|
</parameter>
|
|
|
|
-<parameter name="plugin config" unique="0" required="0">
|
|
+<parameter name="plugin_config" unique="0" required="0">
|
|
<longdesc lang="en">
|
|
Location of the OpenStack Default Plugin (Open-vSwitch) configuration file
|
|
</longdesc>
|
|
--- a/ocf/nova-novnc
|
|
+++ b/ocf/nova-novnc
|
|
@@ -213,11 +213,9 @@ nova_vnc_console_monitor() {
|
|
|
|
# Check whether we are supposed to monitor by logging into nova-novncproxy
|
|
# and do it if that's the case.
|
|
- vnc_list_check=`netstat -a | grep -s "$OCF_RESKEY_console_port" | grep -qs "LISTEN"`
|
|
- #rc=$?
|
|
- # not sure why grep is returning 1 .. should root cause at some point.
|
|
- # return success for now since service and port are both up
|
|
- rc=0
|
|
+ # Adding -n to netstat so that dns delays will not impact this.
|
|
+ vnc_list_check=`netstat -an | grep -s "$OCF_RESKEY_console_port" | grep -qs "LISTEN"`
|
|
+ rc=$?
|
|
if [ $rc -ne 0 ]; then
|
|
ocf_log err "Nova VNC Console doesn't seem to listen on his default port: $rc"
|
|
return $OCF_NOT_RUNNING
|