Switch from upstart to os-refresh-config for MySQL server-id's

This is both more reliable, and more cross-platform. With the
mysql element, this upstart job is never run, as a sysvinit rather
than upstart job triggers mysql.

Change-Id: I208310048d7617ec7726eceee9e4e269f1473510

elements/mariadb-rdo/install.d/10-mariadb-rdo-packages

@@ -4,10 +4,4 @@
 
 set -eux
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages sysstat mytop python-mysqldb mariadb-rdo-galera-server mariadb-galera galera

elements/mariadb/install.d/10-mariadb-packages

@@ -4,10 +4,4 @@
 
 set -eux
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages sysstat mytop python-mysqldb mariadb-galera-server mariadb-client galera

elements/mysql-common/install.d/mysql-set-server-id.upstart

@@ -1,27 +0,0 @@
-# vim: syntax=upstart
-description "Set mysql server_id based on instance-id"
-
-start on starting mysql
-task
-
-env INSTANCE_ID="/var/lib/cloud/data/instance-id"
-env CONF_TARGET="/etc/mysql/conf.d/server_id.cnf"
-
-pre-start script
-    if ! [ -e $INSTANCE_ID ] ; then
-        stop
-        exit 0
-    fi
-end script
-
-script
-    instance=$(cat $INSTANCE_ID)
-    server_id=$(python -c "print 0x${instance##i-}")
-    cat > $CONF_TARGET.new <<EOF
-# Generated by mysql-set-server-id upstart job $(date)
-# From $INSTANCE_ID ${instance}
-[mysqld]
-server_id = $server_id
-EOF
-    mv -f $CONF_TARGET.new $CONF_TARGET
-end script

elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -eux
+
+# Set mysql server_id based on instance-id
+
+INSTANCE_ID_FILE="/var/lib/cloud/data/instance-id"
+CONF_TARGET="/etc/mysql/conf.d/server_id.cnf"
+
+if [ ! -f $INSTANCE_ID_FILE ] ; then
+    exit 0
+fi
+
+if [ -f $CONF_TARGET ] ; then
+    echo "MySQL Server ID has already been configured"
+    exit 0
+fi
+
+INSTANCE_ID=$(cat $INSTANCE_ID_FILE)
+
+if [ $INSTANCE_ID = 'nocloud' ]; then
+    echo "nocloud, not configuring server-id"
+    exit 0
+fi
+
+SERVER_ID=$(python -c "print 0x${INSTANCE_ID##i-}")
+
+cat > $CONF_TARGET <<EOF
+# Generated by os-refresh-config on $(date)
+# From $INSTANCE_ID_FILE ${INSTANCE_ID}
+[mysqld]
+server_id = $SERVER_ID
+EOF

elements/mysql/install.d/10-mysql

@@ -5,12 +5,6 @@
 set -e
 set -o xtrace
 
-if [ "$(dib-init-system)" = "upstart" ] ; then
-    install $(dirname $0)/mysql-set-server-id.upstart /etc/init/mysql-set-server-id.conf
-else
-    echo WARNING: server-id will not be set on systems that boot this image!
-fi
-
 install-packages libaio1 pv rsync lsof
 percona_pkgdir=Percona-XtraDB-Cluster