Changes on a fork from Martin Loschwitiz's (Hastexo) repository on GitHub

Marcio Silva · Marcio Silva · commit 0e03be86ebe9 · 2014-04-28T17:09:14.000-04:00
1) Small changes to allow all resource agent scripts to be called from a
bash prompt

2) Changes to make keystone deployable in active/active mode.

3) Added nova-compute and nova-conductor to the list of resource agents.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.externalToolBuilders/
+.project
diff --git a/ocf/ceilometer-agent-central b/ocf/ceilometer-agent-central
@@ -11,6 +11,8 @@
 # Support: openstack@lists.launchpad.net
 # License: Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -24,7 +26,7 @@
 # OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/cinder-api b/ocf/cinder-api
@@ -11,6 +11,8 @@
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -26,7 +28,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/cinder-schedule b/ocf/cinder-schedule
@@ -11,6 +11,8 @@
 # Support: openstack@lists.launchpad.net
 # License: Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -24,7 +26,7 @@
 # OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/cinder-volume b/ocf/cinder-volume
@@ -5,12 +5,14 @@
 #
 # Description:  Manages an OpenStack Volumes (cinder-volume) process as an HA resource
 #
-# Authors:      Sébastien Han
+# Authors:      Sebastien Han
 # Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
 #
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -23,7 +25,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/glance-api b/ocf/glance-api
@@ -12,6 +12,9 @@
 #
 # (c) 2012      hastexo Professional Services GmbH
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
+#
 # See usage() function below for more details ...
 #
 # OCF instance parameters:
@@ -22,12 +25,13 @@
 #   OCF_RESKEY_os_password
 #   OCF_RESKEY_os_tenant_name
 #   OCF_RESKEY_os_auth_url
+#   OCF_RESKEY_os_image_url
 #   OCF_RESKEY_user
 #   OCF_RESKEY_pid
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
@@ -144,6 +148,14 @@ The URL pointing to this ImageService (glance-api) instance to use when logging
 <content type="string" />
 </parameter>
 
+<parameter name="os_image_url" unique="0" required="0">
+<longdesc lang="en">
+The URL pointing to this particular local instance of glance-api
+</longdesc>
+<shortdesc lang="en">ImageService (glance-api) URL for monitoring login</shortdesc>
+<content type="string" />
+</parameter>
+
 <parameter name="client_binary" unique="0" required="0">
 <longdesc lang="en">
 Location of the OpenStack ImageService client binary (glance)
@@ -243,6 +255,7 @@ glance_api_monitor() {
         --os_password "$OCF_RESKEY_os_password" \
         --os_tenant_name "$OCF_RESKEY_os_tenant_name" \
         --os_auth_url "$OCF_RESKEY_os_auth_url" \
+        --os-image-url "$OCF_RESKEY_os_image_url" \
         index > /dev/null 2>&1
         rc=$?
         if [ $rc -ne 0 ]; then
diff --git a/ocf/glance-registry b/ocf/glance-registry
@@ -12,6 +12,9 @@
 #
 # (c) 2012      hastexo Professional Services GmbH
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
+#
 # See usage() function below for more details ...
 #
 # OCF instance parameters:
@@ -27,7 +30,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/heat-engine b/ocf/heat-engine
@@ -10,6 +10,8 @@
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -24,7 +26,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/keystone b/ocf/keystone
@@ -12,6 +12,10 @@
 #
 # (c) 2012      hastexo Professional Services GmbH
 #
+# Small changes made by marcios@us.ibm.com to: 
+# a) allow it be executed directly 
+# b) allow keystone to be deployed on active/active mode.
+#
 # See usage() function below for more details ...
 #
 # OCF instance parameters:
@@ -22,12 +26,14 @@
 #   OCF_RESKEY_os_password
 #   OCF_RESKEY_os_tenant_name
 #   OCF_RESKEY_os_auth_url
+#   OCF_RESKEY_os_endpoint
+#   OCF_RESKEY_os_token
 #   OCF_RESKEY_user
 #   OCF_RESKEY_pid
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
@@ -130,7 +136,23 @@ The tenant to use when logging into Keystone for monitoring purposes
 
 <parameter name="os_auth_url" unique="0" required="0">
 <longdesc lang="en">
-The URL pointing to this Keystone instance to use when logging in for monitoring purposes
+The AUTH URL pointing to this Keystone instance to use when logging in for monitoring purposes
+</longdesc>
+<shortdesc lang="en">Keystone URL for monitoring login</shortdesc>
+<content type="string" />
+</parameter>
+
+<parameter name="os_endpoint" unique="0" required="0">
+<longdesc lang="en">
+The ENDPOINT URL pointing to this Keystone instance to use when logging in for monitoring purposes
+</longdesc>
+<shortdesc lang="en">Keystone URL for monitoring login</shortdesc>
+<content type="string" />
+</parameter>
+
+<parameter name="os_token" unique="0" required="0">
+<longdesc lang="en">
+The SERVICE token to use when logging in for monitoring purposes
 </longdesc>
 <shortdesc lang="en">Keystone URL for monitoring login</shortdesc>
 <content type="string" />
@@ -245,6 +267,8 @@ keystone_monitor() {
         --os-password "$OCF_RESKEY_os_password" \
         --os-tenant-name "$OCF_RESKEY_os_tenant_name" \
         --os-auth-url "$OCF_RESKEY_os_auth_url" \
+        --os-endpoint "$OCF_RESKEY_os_endpoint" \
+        --os-token "$OCF_RESKEY_os_token" \
         user-list > /dev/null 2>&1
         rc=$?
         if [ $rc -ne 0 ]; then
diff --git a/ocf/neutron-agent-dhcp b/ocf/neutron-agent-dhcp
@@ -11,6 +11,8 @@
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -24,7 +26,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/neutron-agent-l3 b/ocf/neutron-agent-l3
@@ -11,6 +11,8 @@
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -24,7 +26,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/neutron-metadata-agent b/ocf/neutron-metadata-agent
@@ -5,12 +5,14 @@
 #
 # Description:  Manages an OpenStack Volumes (neutron-metadata-agent) process as an HA resource
 #
-# Authors:      Sébastien Han
+# Authors:      Sebastien Han
 # Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
 #
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -23,7 +25,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/neutron-server b/ocf/neutron-server
@@ -12,6 +12,8 @@
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -28,7 +30,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/nova-api b/ocf/nova-api
@@ -5,12 +5,14 @@
 #
 # Description:  Manages an OpenStack Nova API (nova-api) process as an HA resource
 #
-# Authors:      Sébastien Han
+# Authors:      Sebastien Han
 # Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
 #
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -26,7 +28,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/nova-cert b/ocf/nova-cert
@@ -5,12 +5,14 @@
 #
 # Description:  Manages an OpenStack Nova Cert (nova-cert) process as an HA resource
 #
-# Authors:      Sébastien Han
+# Authors:      Sebastien Han
 # Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
 #
 # Support:      openstack@lists.launchpad.net
 # License:      Apache Software License (ASL) 2.0
 #
+# Small changes made by marcios@us.ibm.com to allow it be executed directly 
+# from a bash prompt.
 #
 # See usage() function below for more details ...
 #
@@ -25,7 +27,7 @@
 #   OCF_RESKEY_additional_parameters
 #######################################################################
 # Initialization:
-
+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
diff --git a/ocf/nova-compute b/ocf/nova-compute
diff --git a/ocf/nova-conductor b/ocf/nova-conductor
diff --git a/ocf/nova-consoleauth b/ocf/nova-consoleauth
diff --git a/ocf/nova-network b/ocf/nova-network
diff --git a/ocf/nova-novnc b/ocf/nova-novnc
diff --git a/ocf/nova-scheduler b/ocf/nova-scheduler

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`# Support: [email protected]`
`12`	`12`	`# License: Apache Software License (ASL) 2.0`
`13`	`13`	`#`
	`14`	`+# Small changes made by [email protected] to allow it be executed directly`
	`15`	`+# from a bash prompt.`
`14`	`16`	`#`
`15`	`17`	`# See usage() function below for more details ...`
`16`	`18`	`#`
`@@ -24,7 +26,7 @@`
`24`	`26`	`# OCF_RESKEY_additional_parameters`
`25`	`27`	`#######################################################################`
`26`	`28`	`# Initialization:`
`27`		`-`
	`29`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`28`	`30`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`29`	`31`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@`
`5`	`5`	`#`
`6`	`6`	`# Description: Manages an OpenStack Volumes (cinder-volume) process as an HA resource`
`7`	`7`	`#`
`8`		`-# Authors: Sébastien Han`
	`8`	`+# Authors: Sebastien Han`
`9`	`9`	`# Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr`
`10`	`10`	`#`
`11`	`11`	`# Support: [email protected]`
`12`	`12`	`# License: Apache Software License (ASL) 2.0`
`13`	`13`	`#`
	`14`	`+# Small changes made by [email protected] to allow it be executed directly`
	`15`	`+# from a bash prompt.`
`14`	`16`	`#`
`15`	`17`	`# See usage() function below for more details ...`
`16`	`18`	`#`
`@@ -23,7 +25,7 @@`
`23`	`25`	`# OCF_RESKEY_additional_parameters`
`24`	`26`	`#######################################################################`
`25`	`27`	`# Initialization:`
`26`		`-`
	`28`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`27`	`29`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`28`	`30`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`29`	`31`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@`
`12`	`12`	`#`
`13`	`13`	`# (c) 2012 hastexo Professional Services GmbH`
`14`	`14`	`#`
	`15`	`+# Small changes made by [email protected] to allow it be executed directly`
	`16`	`+# from a bash prompt.`
	`17`	`+#`
`15`	`18`	`# See usage() function below for more details ...`
`16`	`19`	`#`
`17`	`20`	`# OCF instance parameters:`
`@@ -27,7 +30,7 @@`
`27`	`30`	`# OCF_RESKEY_additional_parameters`
`28`	`31`	`#######################################################################`
`29`	`32`	`# Initialization:`
`30`		`-`
	`33`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`31`	`34`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`32`	`35`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`33`	`36`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`# Support: [email protected]`
`11`	`11`	`# License: Apache Software License (ASL) 2.0`
`12`	`12`	`#`
	`13`	`+# Small changes made by [email protected] to allow it be executed directly`
	`14`	`+# from a bash prompt.`
`13`	`15`	`#`
`14`	`16`	`# See usage() function below for more details ...`
`15`	`17`	`#`
`@@ -24,7 +26,7 @@`
`24`	`26`	`# OCF_RESKEY_additional_parameters`
`25`	`27`	`#######################################################################`
`26`	`28`	`# Initialization:`
`27`		`-`
	`29`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`28`	`30`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`29`	`31`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`# Support: [email protected]`
`13`	`13`	`# License: Apache Software License (ASL) 2.0`
`14`	`14`	`#`
	`15`	`+# Small changes made by [email protected] to allow it be executed directly`
	`16`	`+# from a bash prompt.`
`15`	`17`	`#`
`16`	`18`	`# See usage() function below for more details ...`
`17`	`19`	`#`
`@@ -28,7 +30,7 @@`
`28`	`30`	`# OCF_RESKEY_additional_parameters`
`29`	`31`	`#######################################################################`
`30`	`32`	`# Initialization:`
`31`		`-`
	`33`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`32`	`34`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`33`	`35`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`34`	`36`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@`
`5`	`5`	`#`
`6`	`6`	`# Description: Manages an OpenStack Nova API (nova-api) process as an HA resource`
`7`	`7`	`#`
`8`		`-# Authors: Sébastien Han`
	`8`	`+# Authors: Sebastien Han`
`9`	`9`	`# Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr`
`10`	`10`	`#`
`11`	`11`	`# Support: [email protected]`
`12`	`12`	`# License: Apache Software License (ASL) 2.0`
`13`	`13`	`#`
	`14`	`+# Small changes made by [email protected] to allow it be executed directly`
	`15`	`+# from a bash prompt.`
`14`	`16`	`#`
`15`	`17`	`# See usage() function below for more details ...`
`16`	`18`	`#`
`@@ -26,7 +28,7 @@`
`26`	`28`	`# OCF_RESKEY_additional_parameters`
`27`	`29`	`#######################################################################`
`28`	`30`	`# Initialization:`
`29`		`-`
	`31`	`+OCF_ROOT=${OCF_ROOT:-/usr/lib/ocf}`
`30`	`32`	`: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}`
`31`	`33`	`. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs`
`32`	`34`