Removed shareConfig attribute (#42)

craig-willis · bodom0015 · commit 231e154add08 · 2016-09-16T14:44:20.000-05:00
* Removed shareConfig attribute

* useFrom should be string
diff --git a/clowder/clowder-pycharm-xpra.json b/clowder/clowder-pycharm-xpra.json
@@ -22,18 +22,15 @@
     "depends": [
       {
         "key": "clowder",
-        "required": true,
-        "shareConfig": false
+        "required": true
       },
       {
         "key": "mongo",
-        "required": true,
-        "shareConfig": false
+        "required": true
       },
       {
         "key": "rabbitmq",
-        "required": true,
-        "shareConfig": false
+        "required": true
       }
     ],
     "volumeMounts": [
diff --git a/dataverse/dataverse.json b/dataverse/dataverse.json
@@ -20,7 +20,7 @@
       { "key": "solr", "required": true },
       { "key": "rserve", "required": true},
       { "key": "tworavens", "required": false },
-      { "key": "dvicat", "required": false, "shareConfig": true }
+      { "key": "dvicat", "required": false }
     ],
     "config":  [
         {
@@ -41,10 +41,8 @@
         },
         {
             "name": "POSTGRES_PASSWORD",
-            "value": "",
-            "label": "Database password",
-            "canOverride": true,
-            "isPassword": true
+            "useFrom": "postgres",
+            "canOverride": false
         },
         {
             "name": "RSERVE_USER",
diff --git a/dspace/dspace.json b/dspace/dspace.json
@@ -14,31 +14,26 @@
     "depends": [
         {
             "key": "postgres",
-            "required": true,
-            "shareConfig": false
+            "required": true
         }
     ],
     "config": [
         {
             "name": "POSTGRES_SCHEMA",
             "value": "dspace",
-            "label": "Postgres Schema",
+            "label": "Postgres Database",
             "isPassword": false,
             "canOverride": false
         },
         {
             "name": "POSTGRES_USER",
-            "value": "dspace",
-            "label": "Postgres User",
-            "isPassword": false,
+            "useFrom" : "postgres",
             "canOverride": false
         },
         {
             "name": "POSTGRES_PASSWORD",
-            "value": "dspace",
-            "label": "Postgres Password",
-            "isPassword": true,
-            "canOverride": true
+            "useFrom" : "postgres",
+            "canOverride": false
         },
         {
             "name": "POSTGRES_DB_HOST",
diff --git a/girder/girder.json b/girder/girder.json
@@ -16,8 +16,7 @@
   "depends": [
     {
       "key": "mongo",
-      "required": true,
-      "shareConfig": false
+      "required": true
     }
   ],
   "args": [
diff --git a/logstash/logstash.json b/logstash/logstash.json
@@ -14,8 +14,7 @@
     "depends": [
         {
             "key": "elasticsearch2",
-            "required": true,
-            "shareConfig": false
+            "required": true
         }
     ],
     "config": [],
diff --git a/protege/webprotege.json b/protege/webprotege.json
@@ -14,8 +14,7 @@
     "depends": [
         {
             "key": "mongo",
-            "required": true,
-            "shareConfig": false
+            "required": true
         }
     ],
     "ports": [
diff --git a/schemas/spec-schema.json b/schemas/spec-schema.json
@@ -55,8 +55,8 @@
           "required": {
             "type": "boolean"
           },
-          "shareConfig": {
-            "type": "boolean"
+          "useFrom": {
+            "type": "string"
           }
         },
         "required": [

Original file line number	Diff line number	Diff line change
`@@ -22,18 +22,15 @@`
`22`	`22`	`"depends": [`
`23`	`23`	`{`
`24`	`24`	`"key": "clowder",`
`25`		`- "required": true,`
`26`		`- "shareConfig": false`
	`25`	`+ "required": true`
`27`	`26`	`},`
`28`	`27`	`{`
`29`	`28`	`"key": "mongo",`
`30`		`- "required": true,`
`31`		`- "shareConfig": false`
	`29`	`+ "required": true`
`32`	`30`	`},`
`33`	`31`	`{`
`34`	`32`	`"key": "rabbitmq",`
`35`		`- "required": true,`
`36`		`- "shareConfig": false`
	`33`	`+ "required": true`
`37`	`34`	`}`
`38`	`35`	`],`
`39`	`36`	`"volumeMounts": [`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@`
`16`	`16`	`"depends": [`
`17`	`17`	`{`
`18`	`18`	`"key": "mongo",`
`19`		`- "required": true,`
`20`		`- "shareConfig": false`
	`19`	`+ "required": true`
`21`	`20`	`}`
`22`	`21`	`],`
`23`	`22`	`"args": [`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@`
`14`	`14`	`"depends": [`
`15`	`15`	`{`
`16`	`16`	`"key": "elasticsearch2",`
`17`		`- "required": true,`
`18`		`- "shareConfig": false`
	`17`	`+ "required": true`
`19`	`18`	`}`
`20`	`19`	`],`
`21`	`20`	`"config": [],`