From 6ab2a5819fb890d207788a5fdbd5b829212bf55c Mon Sep 17 00:00:00 2001
From: Nicolas Thomas <nicolas.thomas@canonical.com>
Date: Wed, 20 Apr 2016 14:44:52 -0500
Subject: [PATCH 1/2] Port actions from AIO to regular charms.

---
 .../trusty/clearwater-homestead/actions.yaml  | 19 +++++++++++++++++++
 .../actions/create-update-user                | 18 ++++++++++++++++++
 .../clearwater-homestead/actions/delete-user  |  9 +++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 charms/trusty/clearwater-homestead/actions.yaml
 create mode 100755 charms/trusty/clearwater-homestead/actions/create-update-user
 create mode 100755 charms/trusty/clearwater-homestead/actions/delete-user

diff --git a/charms/trusty/clearwater-homestead/actions.yaml b/charms/trusty/clearwater-homestead/actions.yaml
new file mode 100644
index 0000000..424ae89
--- /dev/null
+++ b/charms/trusty/clearwater-homestead/actions.yaml
@@ -0,0 +1,19 @@
+create-update-user:
+  description: Create a user, or update a user if they already exist.
+  params:
+    number:
+      description: The number to provision
+      type: string
+    password:
+      description: The number's password
+      type: string
+  required: [number, password]
+  additionalProperties: false
+delete-user:
+  description: Delete a user.  If the user does not exist, this is still considered success.
+  params:
+    number:
+      description: The number to provision
+      type: string
+  required: [number]
+  additionalProperties: false
diff --git a/charms/trusty/clearwater-homestead/actions/create-update-user b/charms/trusty/clearwater-homestead/actions/create-update-user
new file mode 100755
index 0000000..27d9ba4
--- /dev/null
+++ b/charms/trusty/clearwater-homestead/actions/create-update-user
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+# Get the configuration and action parameters.
+home_domain=$(config-get zone)
+number=$(action-get number)
+password=$(action-get password)
+
+
+# If the user doesn't exist, try to create them.  Otherwise, try to update them.
+if ! sudo -S /usr/share/clearwater/bin/display_user $number $home_domain ; 
+then
+    echo "Subscriber doesn't exist - creating"
+    sudo -S /usr/share/clearwater/bin/create_user $number $home_domain $password
+else
+  echo "Subscriber exists - updating"
+  sudo -S /usr/share/clearwater/bin/update_user $number $home_domain --password $password
+fi
diff --git a/charms/trusty/clearwater-homestead/actions/delete-user b/charms/trusty/clearwater-homestead/actions/delete-user
new file mode 100755
index 0000000..79f9727
--- /dev/null
+++ b/charms/trusty/clearwater-homestead/actions/delete-user
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Get the configuration and action parameters.
+home_domain=$(config-get zone)
+number=$(action-get number)
+
+# Delete the user.
+sudo -S /usr/share/clearwater/bin/delete_user -y $number $home_domain

From dcb30bc051b0bf9db327cd0bc8fffbe4b74facd0 Mon Sep 17 00:00:00 2001
From: Nicolas Thomas <nicolas.thomas@canonical.com>
Date: Wed, 20 Apr 2016 17:45:05 -0500
Subject: [PATCH 2/2] Update create-update -user

---
 charms/trusty/clearwater-homestead/actions/create-update-user | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charms/trusty/clearwater-homestead/actions/create-update-user b/charms/trusty/clearwater-homestead/actions/create-update-user
index 27d9ba4..15b4597 100755
--- a/charms/trusty/clearwater-homestead/actions/create-update-user
+++ b/charms/trusty/clearwater-homestead/actions/create-update-user
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 # Get the configuration and action parameters.
 home_domain=$(config-get zone)