This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new f0f7ef4 [DLAB-1236] Added new cloud parameter in provisioning
f0f7ef4 is described below
commit f0f7ef4acf2779117455f197b5df60f213c807ec
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Mon Nov 4 15:40:35 2019 +0200
[DLAB-1236] Added new cloud parameter in provisioning
---
.../src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java | 2 ++
.../src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java | 2 ++
.../src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java | 2 ++
services/provisioning-service/provisioning.yml | 1 +
.../src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java | 1 +
.../java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java | 3 +++
6 files changed, 11 insertions(+)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
index 6552902..aad91c6 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
@@ -68,6 +68,8 @@ public class AwsCloudSettings extends CloudSettings {
protected String sbn;
@JsonProperty("conf_key_dir")
protected String confKeyDir;
+ @JsonProperty("conf_image_enabled")
+ private boolean imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private boolean sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
index 901216d..3bffe3a 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
@@ -46,6 +46,8 @@ public class AzureCloudSettings extends CloudSettings {
private String azureSecurityGroupName;
@JsonProperty("conf_key_dir")
protected String confKeyDir;
+ @JsonProperty("conf_image_enabled")
+ private boolean imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private boolean sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
index 5542aeb..d9628a0 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
@@ -62,6 +62,8 @@ public class GcpCloudSettings extends CloudSettings {
protected String zone;
@JsonProperty("gcp_region")
protected String region;
+ @JsonProperty("conf_image_enabled")
+ private boolean imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private boolean sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
diff --git a/services/provisioning-service/provisioning.yml
b/services/provisioning-service/provisioning.yml
index d13a399..f241525 100644
--- a/services/provisioning-service/provisioning.yml
+++ b/services/provisioning-service/provisioning.yml
@@ -119,6 +119,7 @@ cloudProperties:
datalakeTagName: AZURE_DATALAKE_TAG
azureClientId: AZURE_CLIENT_ID
gcpProjectId: GCP_PROJECT_ID
+ imageEnabled: IMAGE_ENABLED
sharedImageEnabled: SHARED_IMAGE_ENABLED
ldap:
host: LDAP_HOST
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
index b79706c..c166201 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
@@ -26,6 +26,7 @@ public class CloudConfiguration {
private final String azureClientId;
private final String peeringId;
private final String gcpProjectId;
+ private final boolean imageEnabled;
private final boolean sharedImageEnabled;
@JsonProperty("ldap")
private final LdapConfig ldapConfig;
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
index baa40fb..4c0e73d 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
@@ -91,6 +91,7 @@ public class CommandBuilder {
.azureVpcName(cloudConfiguration.getVpcId())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.azureIamUser(settings.getIamUser())
+
.imageEnabled(cloudConfiguration.isImageEnabled())
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
.stepCertsEnabled(stepCerts.isEnabled())
.stepCertsRootCA(stepCerts.getRootCA())
@@ -119,6 +120,7 @@ public class CommandBuilder {
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.gcpIamUser(settings.getIamUser())
+
.imageEnabled(cloudConfiguration.isImageEnabled())
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
.stepCertsEnabled(stepCerts.isEnabled())
.stepCertsRootCA(stepCerts.getRootCA())
@@ -150,6 +152,7 @@ public class CommandBuilder {
.cloud(conf.getCloudProvider().getName())
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
+
.imageEnabled(cloudConfiguration.isImageEnabled())
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
.stepCertsEnabled(stepCerts.isEnabled())
.stepCertsRootCA(stepCerts.getRootCA())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
