Commit fd9d5fd8 authored by Marta Różańska's avatar Marta Różańska
Browse files

Merge branch 'morph-rc1.5' into 'morphemic-rc2.0'

Morph rc1.5

See merge request !33
parents d5e92245 6f6024d6
Pipeline #17659 passed with stages
in 15 minutes and 38 seconds
......@@ -62,9 +62,6 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer
String scopeValue = null;
String defaultNetwork = null;
String regionBlacklist = null;
Integer identityVersion;
String scopePrefix;
String scopeValue;
JSONObject scopeJSON = new JSONObject();
LinkedHashMap cloudConfiguration = (LinkedHashMap)((LinkedHashMap) cloudDefinition).get("cloudConfiguration");
......@@ -85,6 +82,7 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer
nodeGroup = (String) cloudConfiguration.get("nodeGroup");
}
cloudJSON.put("securityGroup", MoreObjects.firstNonNull(securityGroup, JSONObject.NULL));
cloudJSON.put("defaultNetwork", MoreObjects.firstNonNull(defaultNetwork, JSONObject.NULL));
cloudJSON.put("credentials", credentialsJSON);
cloudJSON.put("nodeGroup", MoreObjects.firstNonNull(nodeGroup, JSONObject.NULL));
cloudsJSONArray.put(cloudJSON);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment