You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2019/11/07 09:22:37 UTC
[incubator-dlab] branch develop updated: Added imageEnabled
parameter to provisioning.yml
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new d70bb8d Added imageEnabled parameter to provisioning.yml
d70bb8d is described below
commit d70bb8df855303065baed05d41d59914ad380edf
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Thu Nov 7 11:21:19 2019 +0200
Added imageEnabled parameter to provisioning.yml
---
.../java/com/epam/dlab/dto/aws/AwsCloudSettings.java | 2 ++
.../com/epam/dlab/dto/azure/AzureCloudSettings.java | 2 ++
.../java/com/epam/dlab/dto/gcp/GcpCloudSettings.java | 2 ++
services/provisioning-service/provisioning.yml | 1 +
.../com/epam/dlab/backendapi/CloudConfiguration.java | 20 ++++++++++++++++++++
.../backendapi/core/commands/CommandBuilder.java | 3 +++
6 files changed, 30 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 73417b2..c27e1b2 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 String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private String sharedImageEnabled;
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 7dafa79..19e4f56 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 String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private String sharedImageEnabled;
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 5617a51..370da91 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 String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
private String sharedImageEnabled;
diff --git a/services/provisioning-service/provisioning.yml b/services/provisioning-service/provisioning.yml
index 1806177..c127b49 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: CONF_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 22587b5..5653a90 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
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.epam.dlab.backendapi;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,6 +45,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 21801a6..68e337b 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
@@ -89,6 +89,7 @@ public class CommandBuilder {
.azureVpcName(cloudConfiguration.getVpcId())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.azureIamUser(settings.getIamUser())
+ .imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
.build();
}
@@ -111,6 +112,7 @@ public class CommandBuilder {
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.gcpIamUser(settings.getIamUser())
+ .imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
.build();
}
@@ -136,6 +138,7 @@ public class CommandBuilder {
.cloud(conf.getCloudProvider().getName())
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
+ .imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org