This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1467
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1467 by this push:
     new ae860d9  Added missed parameters
     new 5a183c6  Merge remote-tracking branch 'origin/DLAB-1467' into DLAB-1467
ae860d9 is described below

commit ae860d904c6e8b707ce8137d18e79f0d441b98e6
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Feb 5 13:52:00 2020 +0200

    Added missed parameters
---
 .../src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java     | 4 ++++
 .../java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java   | 2 ++
 2 files changed, 6 insertions(+)

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 3c6a166..21a3261 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
@@ -36,6 +36,10 @@ public class AzureCloudSettings extends CloudSettings {
     private String azureRegion;
     @JsonProperty("azure_iam_user")
     private String azureIamUser;
+    @JsonProperty("conf_service_base_name")
+    protected String sbn;
+    @JsonProperty("conf_os_family")
+    protected String os;
     @JsonProperty("azure_vpc_name")
     private String azureVpcName;
     @JsonProperty("azure_subnet_name")
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 3d0bcf8..9447e5d 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
@@ -93,6 +93,8 @@ public class CommandBuilder {
                                .azureVpcName(cloudConfiguration.getVpcId())
                                .confKeyDir(cloudConfiguration.getConfKeyDir())
                                .azureIamUser(settings.getIamUser())
+                               .sbn(cloudConfiguration.getServiceBaseName())
+                               .os(cloudConfiguration.getOs())
                                
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
                                
.stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
                                .stepCertsRootCA(stepCerts.getRootCA())


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to