Merge lp:~jseutter/charms/precise/nova-cloud-controller/ha-support-with-health into lp:~openstack-charmers/charms/precise/nova-cloud-controller/ha-support

[Jerry Seutter]

This branch adds add_to_cluster, remove_from_cluster and health_scripts.d to the nova-cloud-controller charm.

The health scripts check the following things:
- The crm multicast port is open
- The nova-api-ec2, nova-api-os-compute, nova-cert, nova-conductor, nova-objectstore and nova-scheduler services are running

=== modified file 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2013-03-15 19:08:40 +0000
+++ hooks/nova-cloud-controller-relations	2013-03-20 21:51:19 +0000
@@ -76,6 +76,17 @@
 
   determine_services
   service_ctl all restart
+
+  # Save our scriptrc env variables for health checks
+  declare -a env_vars=(
+      "OPENSTACK_PORT_MCASTPORT=$(config-get ha-mcastport)"
+      'OPENSTACK_SERVICE_API_EC2=nova-api-ec2'
+      'OPENSTACK_SERVICE_API_OS_COMPUTE=nova-api-os-compute'
+      'OPENSTACK_SERVICE_CERT=nova-cert'
+      'OPENSTACK_SERVICE_CONDUCTOR=nova-conductor'
+      'OPENSTACK_SERVICE_OBJECTSTORE=nova-objectstore'
+      'OPENSTACK_SERVICE_SCHEDULER=nova-scheduler')
+  save_script_rc ${env_vars[@]}
   configure_https
 }
 

=== modified file 'revision'
--- revision	2013-03-15 19:08:40 +0000
+++ revision	2013-03-20 21:51:19 +0000
@@ -1,1 +1,1 @@
-238
+239

=== added directory 'scripts'
=== added file 'scripts/add_to_cluster'
--- scripts/add_to_cluster	1970-01-01 00:00:00 +0000
+++ scripts/add_to_cluster	2013-03-20 21:51:19 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+crm node online

=== added directory 'scripts/health_checks.d'
=== added file 'scripts/health_checks.d/service_ports_live'
--- scripts/health_checks.d/service_ports_live	1970-01-01 00:00:00 +0000
+++ scripts/health_checks.d/service_ports_live	2013-03-20 21:51:19 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Validate that service ports are active
+HEALTH_DIR=`dirname $0`
+SCRIPTS_DIR=`dirname $HEALTH_DIR`
+. $SCRIPTS_DIR/scriptrc
+set -e
+
+# Grab any OPENSTACK_PORT* environment variables
+openstack_ports=`env| awk -F '=' '(/OPENSTACK_PORT/){print $2}'`
+for port in $openstack_ports
+do
+    netstat -ln | grep -q ":$port "
+done

=== added file 'scripts/health_checks.d/service_running'
--- scripts/health_checks.d/service_running	1970-01-01 00:00:00 +0000
+++ scripts/health_checks.d/service_running	2013-03-20 21:51:19 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Validate that service is running
+HEALTH_DIR=`dirname $0`
+SCRIPTS_DIR=`dirname $HEALTH_DIR`
+. $SCRIPTS_DIR/scriptrc
+set -e
+
+# Grab any OPENSTACK_SERVICE* environment variables
+openstack_service_names=`env| awk -F '=' '(/OPENSTACK_SERVICE/){print $2}'`
+for service_name in $openstack_service_names
+do
+    service $service_name status 2>/dev/null | grep -q running
+done

=== added file 'scripts/remove_from_cluster'
--- scripts/remove_from_cluster	1970-01-01 00:00:00 +0000
+++ scripts/remove_from_cluster	2013-03-20 21:51:19 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+crm node standby