You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/02/27 14:33:02 UTC
[incubator-dlab] branch DLAB-1595 created (now 7e683e7)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 7e683e7 [DLAB-1595]: added features block
This branch includes the following new commits:
new 7b7791c [DLAB-1468]: disables shared image enabled variable in ssn_configure
new 7e683e7 [DLAB-1595]: added features block
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1468]: disables shared image enabled
variable in ssn_configure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7b7791c173194439940e5c51de613982bbcadd1e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 15:35:06 2020 +0200
[DLAB-1468]: disables shared image enabled variable in ssn_configure
---
.../src/general/scripts/aws/ssn_configure.py | 8 ++++----
.../src/general/scripts/azure/ssn_configure.py | 8 ++++----
.../src/general/scripts/gcp/ssn_configure.py | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..850d49b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -465,10 +465,10 @@ if __name__ == "__main__":
'key': 'AZURE_CLIENT_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+ # {
+ # 'key': 'SHARED_IMAGE_ENABLED',
+ # 'value': os.environ['conf_shared_image_enabled']
+ # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 02c4eaa..636bfa5 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -311,10 +311,10 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+# {
+# 'key': 'SHARED_IMAGE_ENABLED',
+# 'value': os.environ['conf_shared_image_enabled']
+# },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 87cd29a..c8b4cae 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -406,10 +406,10 @@ if __name__ == "__main__":
'key': 'PEERING_ID',
'value': ''
},
- {
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
+ # {
+ # 'key': 'SHARED_IMAGE_ENABLED',
+ # 'value': os.environ['conf_shared_image_enabled']
+ # },
{
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1595]: added features block
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1595
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7e683e7d251c569222c7fc492978db04775b2e0f
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 27 16:26:40 2020 +0200
[DLAB-1595]: added features block
---
infrastructure-provisioning/terraform/azure/endpoint/main/main.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
index 5d832fa..b6ed11e 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
@@ -24,6 +24,7 @@ locals {
}
provider "azurerm" {
+ features {}
subscription_id = local.json_data.subscriptionId
client_id = local.json_data.clientId
client_secret = local.json_data.clientSecret
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org