From 4b5193442d787002c48704665aab80038f0f297f Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris@centaurisolutions.nl>
Date: Tue, 11 Dec 2018 15:39:33 +0100
Subject: [PATCH] Add app-name as an option during pool creation

Change-Id: I5e43f896d433b5a51ed7ecf6ddd936458c90cc24
Closes-Bug: #1807775
---
 actions.yaml           | 3 +++
 actions/create-pool.py | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/actions.yaml b/actions.yaml
index f8a397b8..85cfb747 100644
--- a/actions.yaml
+++ b/actions.yaml
@@ -48,6 +48,9 @@ create-pool:
     name:
       type: string
       description: The name of the pool
+    app-name:
+      type: string
+      description: App name to set on the newly created pool.
     profile-name:
       type: string
       description: The crush profile to use for this pool.  The ruleset must exist first.
diff --git a/actions/create-pool.py b/actions/create-pool.py
index aa4a27d2..81a8a554 100755
--- a/actions/create-pool.py
+++ b/actions/create-pool.py
@@ -25,19 +25,24 @@ from charmhelpers.contrib.storage.linux.ceph import ErasurePool, ReplicatedPool
 def create_pool():
     pool_name = action_get("name")
     pool_type = action_get("pool-type")
+    app_name = action_get("app-name") or None
     try:
         if pool_type == "replicated":
             replicas = action_get("replicas")
             replicated_pool = ReplicatedPool(name=pool_name,
                                              service='admin',
-                                             replicas=replicas)
+                                             replicas=replicas,
+                                             app_name=app_name,
+                                             )
             replicated_pool.create()
 
         elif pool_type == "erasure":
             crush_profile_name = action_get("erasure-profile-name")
             erasure_pool = ErasurePool(name=pool_name,
                                        erasure_code_profile=crush_profile_name,
-                                       service='admin')
+                                       service='admin',
+                                       app_name=app_name,
+                                       )
             erasure_pool.create()
         else:
             log("Unknown pool type of {}. Only erasure or replicated is "