remove hardcoded enforcement of usage only pxd driver

d2iq-archive · Sep 4, 2020 · e2ae4dd · e2ae4dd
1 parent 410c2a6
commit e2ae4dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/frameworks/cassandra/src/main/dist/svc.yml b/frameworks/cassandra/src/main/dist/svc.yml
@@ -62,7 +62,7 @@ pods:
       portworx-volume:
         type: DOCKER
         container-path: container-path
-        driver-name: pxd
+        driver-name: {{CASSANDRA_EXTERNAL_VOLUME_DRIVER_NAME}}
         driver-options: '{{{CASSANDRA_EXTERNAL_VOLUME_PORTWORX_OPTIONS}}}'
         {{#CASSANDRA_EXTERNAL_VOLUME_NAME}}
         volume-name: {{CASSANDRA_EXTERNAL_VOLUME_NAME}}

diff --git a/frameworks/cassandra/universe/config.json b/frameworks/cassandra/universe/config.json
@@ -496,6 +496,11 @@
               "type": "string",
               "description": "Volume name. If empty service path will be used.",
               "default": ""
+            },
+            "driver_name": {
+              "type": "string",
+              "description": "Docker volume driver name.",
+              "default": "pxd"
             }
           }
         },

diff --git a/frameworks/cassandra/universe/marathon.json.mustache b/frameworks/cassandra/universe/marathon.json.mustache
@@ -115,6 +115,7 @@
     "CASSANDRA_EXTERNAL_VOLUME_ENABLED" : "{{nodes.external_volume.enabled}}",
     "CASSANDRA_EXTERNAL_VOLUME_PORTWORX_OPTIONS" : "{{nodes.external_volume.portworx_volume_options}}",
     "CASSANDRA_EXTERNAL_VOLUME_NAME" : "{{nodes.external_volume.volume_name}}",
+    "CASSANDRA_EXTERNAL_VOLUME_DRIVER_NAME" : "{{nodes.external_volume.driver_name}}",
     "TASKCFG_ALL_CASSANDRA_HEAP_SIZE_MB": "{{nodes.heap.size}}",
     "TASKCFG_ALL_CASSANDRA_HEAP_NEW_MB": "{{nodes.heap.new}}",
     "CASSANDRA_JAVA_URI": "{{resource.assets.uris.cassandra-jre-tar-gz}}",

diff --git a/...eduler/src/main/java/com/mesosphere/sdk/offer/evaluate/ExternalVolumeProviderFactory.java b/...eduler/src/main/java/com/mesosphere/sdk/offer/evaluate/ExternalVolumeProviderFactory.java
@@ -19,16 +19,12 @@ public static ExternalVolumeProvider getExternalVolumeProvider(String serviceNam
                                                                  Map<String, String> driverOptions)
   {
 
-    if ("pxd".equals(driverName)) {
       return new PortworxVolumeProvider(
           serviceName,
           volumeName,
           driverName,
           podType,
           podIndex,
           driverOptions);
-    } else {
-      throw new IllegalArgumentException("Unsupported external volume driver " + driverName);
-    }
   }
 }