Merge pull request #167 from francescotimperi/3.0.0-testing-ftt

upgrade adduser to support generic object storage setup

Author: francescotimperi

admin/nuvfile.yml

@@ -85,10 +85,10 @@ tasks:
 
         export REDIS_ENABLED=false
         export MONGODB_ENABLED=false
-        export MINIO_DATA_ENABLED=false
-        export MINIO_STATIC_ENABLED=false
+        export STORAGE_DATA_ENABLED=false
+        export STORAGE_STATIC_ENABLED=false
         export POSTGRES_ENABLED=false
-        export MINIO_STORAGE_QUOTA=auto
+        export OBJECT_STORAGE_QUOTA=auto
 
         if {{.__redis}} || {{.__all}}
         then 
@@ -110,19 +110,19 @@ tasks:
           fi
         fi
 
-        if {{.__minio}} || {{.__all}}
+        if {{.__storage}} || {{.__all}}
         then 
-          if $NUVOLARIS_MINIO
+          if $NUVOLARIS_MINIO || $NUVOLARIS_COSI
           then 
-            MINIO_DATA_ENABLED=true
-            MINIO_STATIC_ENABLED=true
+            STORAGE_DATA_ENABLED=true
+            STORAGE_STATIC_ENABLED=true
           else 
-            nuv -die "Error! Minio is not enabled in Nuvolaris"
+            nuv -die "Error! Onject Storage is not enabled in Nuvolaris"
           fi
         fi
 
         if test -n "{{.__storagequota}}"
-        then MINIO_STORAGE_QUOTA={{.__storagequota}}
+        then OBJECT_STORAGE_QUOTA={{.__storagequota}}
         fi         
 
         if {{.__postgres}} || {{.__all}}

admin/nuvopts.txt

@@ -1,7 +1,7 @@
 Subcommand: nuv admin
 
 Usage:
-  admin adduser <username> <email> <password> [--all] [--redis] [--mongodb] [--minio] [--postgres] [--storagequota=<quota>|auto]
+  admin adduser <username> <email> <password> [--all] [--redis] [--mongodb] [--storage] [--postgres] [--storagequota=<quota>|auto]
   admin deleteuser <username>
 
 Commands:
@@ -12,6 +12,6 @@ Options:
   --all                   enable all services
   --redis                 enable redis
   --mongodb               enable mongodb
-  --minio                 enable minio
+  --storage               enable object based storage
   --postgres              enable postgres
   --storagequota=<quota>

admin/user-crd.yaml

@@ -40,10 +40,10 @@ spec:
     password: ${USER_SECRET_POSTGRES}
   object-storage:        
     password: ${USER_SECRET_MINIO}
-    quota: "${MINIO_STORAGE_QUOTA:-auto}"
+    quota: "${OBJECT_STORAGE_QUOTA:-auto}"
     data:
-      enabled: ${MINIO_DATA_ENABLED}
+      enabled: ${STORAGE_DATA_ENABLED}
       bucket: ${USERNAME}-data
     route:
-      enabled: ${MINIO_STATIC_ENABLED}
+      enabled: ${STORAGE_STATIC_ENABLED}
       bucket: ${USERNAME}-web