[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 6e6a7f7 [odahu-integration] Bugfix
6e6a7f7 is described below
commit 6e6a7f71e53528e05d869cfd1dbc833cad9e7e16
Author: Demyan Mysakovets
AuthorDate: Wed Apr 15 15:24:42 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index e14f9b9..80d4904 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -285,7 +285,7 @@ if __name__ == "__main__":
{"name": "dataengine-service", "tag": "latest"},
{"name": "dataengine", "tag": "latest"}]
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} " \
- "--cloud_provider {} --region --gcr_creds {} --odahu_image
{}".format(instance_hostname,
+ "--cloud_provider {} --region {} --gcr_creds {} --odahu_image
{}".format(instance_hostname,
"{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name']),
json.dumps(additional_config), os.environ['conf_os_family'],
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 3083819 [odahu-integration] Bugfix
3083819 is described below
commit 3083819a1b3bfa632127946796889d5ddcfe22c0
Author: Demyan Mysakovets
AuthorDate: Wed Apr 15 14:40:23 2020 +0300
[odahu-integration] Bugfix
---
.../src/general/files/aws/odahu_description.json | 8
.../src/general/scripts/aws/ssn_configure.py | 6 --
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 +---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/files/aws/odahu_description.json
b/infrastructure-provisioning/src/general/files/aws/odahu_description.json
new file mode 100644
index 000..160a2ec
--- /dev/null
+++ b/infrastructure-provisioning/src/general/files/aws/odahu_description.json
@@ -0,0 +1,8 @@
+{
+ "template_name": "OdahuFlow cluster",
+ "description": "OdahuFlow cluster",
+ "environment_type": "computational",
+ "templates":
+ [
+ ]
+}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..e14f9b9 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -274,6 +274,7 @@ if __name__ == "__main__":
additional_config = [{"name": "base", "tag": "latest"},
{"name": "edge", "tag": "latest"},
{"name": "project", "tag": "latest"},
+ {"name": "odahu", "tag": "latest"},
{"name": "jupyter", "tag": "latest"},
{"name": "rstudio", "tag": "latest"},
{"name": "zeppelin", "tag": "latest"},
@@ -284,12 +285,13 @@ if __name__ == "__main__":
{"name": "dataengine-service", "tag": "latest"},
{"name": "dataengine", "tag": "latest"}]
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} " \
- "--cloud_provider {} --region {}".format(instance_hostname,
+ "--cloud_provider {} --region --gcr_creds {} --odahu_image
{}".format(instance_hostname,
"{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name']),
json.dumps(additional_config), os.environ['conf_os_family'],
dlab_ssh_user,
os.environ['ssn_dlab_path'],
-
os.environ['conf_cloud_provider'], os.environ['aws_region'])
+
os.environ['conf_cloud_provider'], os.environ['aws_region'],
+
os.environ['ssn_gcr_creds'], os.environ['odahu_deploy_image'])
try:
local("~/scripts/{}.py {}".format('configure_docker', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 93791a9..a671faf 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -100,9 +100,7 @@ def login_in_gcr(os_user, gcr_creds, odahu_image,
dlab_path):
local('scp -i {} /tmp/config {}:/tmp/config'.format(args.keyfile,
env.host_string))
sudo('mkdir /home/{}/.docker'.format(os_user))
sudo('cat /tmp/config | base64 --decode >
/home/{}/.docker/config.json'.format(os_user))
-sudo('sed -i "s|ODAHU_IMAGE|{}|" '
-
'{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image,
-
dlab_path))
+sudo('sed -i "s|ODAHU_IMAGE|{}|"
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image,
dlab_path))
except Exception as err:
traceback.print_exc()
print('Failed to prepare odahu image: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new c4d95a8 [odahu-integration] Bugfix
c4d95a8 is described below
commit c4d95a8772eb8db88767664ff269c65f1781943f
Author: Demyan Mysakovets
AuthorDate: Tue Apr 14 15:33:12 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index ba45e94..5b8e948 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -87,6 +87,7 @@ def login_in_gcr(gcr_creds, odahu_image, dlab_path):
sudo('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg]
https://packages.cloud.google.com/apt '
'cloud-sdk main" | tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list')
sudo('apt-get -y install apt-transport-https ca-certificates
gnupg')
+sudo('curl https://packages.cloud.google.com/apt/doc/apt-key.gpg |
apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -')
sudo('apt-get update')
sudo('apt-get -y install google-cloud-sdk')
except Exception as err:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 3ea7505 [odahu-integration] Bugfix
3ea7505 is described below
commit 3ea75058f260ce00166007116f3343404a21fe3a
Author: Demyan Mysakovets
AuthorDate: Tue Apr 14 13:52:38 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 7723b92..ba45e94 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -87,7 +87,8 @@ def login_in_gcr(gcr_creds, odahu_image, dlab_path):
sudo('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg]
https://packages.cloud.google.com/apt '
'cloud-sdk main" | tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list')
sudo('apt-get -y install apt-transport-https ca-certificates
gnupg')
-sudo('apt-get update && apt-get -y install google-cloud-sdk')
+sudo('apt-get update')
+sudo('apt-get -y install google-cloud-sdk')
except Exception as err:
traceback.print_exc()
print('Failed to install gcloud: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 0effadb [odahu-integration] Bugfix
0effadb is described below
commit 0effadb59a22649e150e21aa44a72c5b4e4e17d8
Author: Demyan Mysakovets
AuthorDate: Tue Apr 14 13:15:55 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 97f94b1..7723b92 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -86,8 +86,8 @@ def login_in_gcr(gcr_creds, odahu_image, dlab_path):
try:
sudo('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg]
https://packages.cloud.google.com/apt '
'cloud-sdk main" | tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list')
-sudo('sudo apt-get -y install apt-transport-https ca-certificates
gnupg')
-sudo('sudo apt-get update && sudo apt-get -y install
google-cloud-sdk')
+sudo('apt-get -y install apt-transport-https ca-certificates
gnupg')
+sudo('apt-get update && apt-get -y install google-cloud-sdk')
except Exception as err:
traceback.print_exc()
print('Failed to install gcloud: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 314a202 [odahu-integration] Bugfix
314a202 is described below
commit 314a20269e58af8f8f6d0cfcdd3c994421ae26b3
Author: Demyan Mysakovets
AuthorDate: Tue Apr 14 12:55:50 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index abae744..97f94b1 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -84,10 +84,10 @@ def add_china_repository(dlab_path):
def login_in_gcr(gcr_creds, odahu_image, dlab_path):
if os.environ['conf_cloud_provider'] != 'gcp':
try:
-local('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg]
https://packages.cloud.google.com/apt '
- 'cloud-sdk main" | sudo tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list')
-local('sudo apt-get -y install apt-transport-https ca-certificates
gnupg')
-local('sudo apt-get update && sudo apt-get -y install
google-cloud-sdk')
+sudo('echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg]
https://packages.cloud.google.com/apt '
+ 'cloud-sdk main" | tee -a
/etc/apt/sources.list.d/google-cloud-sdk.list')
+sudo('sudo apt-get -y install apt-transport-https ca-certificates
gnupg')
+sudo('sudo apt-get update && sudo apt-get -y install
google-cloud-sdk')
except Exception as err:
traceback.print_exc()
print('Failed to install gcloud: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 8176f1f [odahu-integration] Bugfix
new 2b1ae93 Merge remote-tracking branch 'origin/odahu-integration' into
odahu-integration
8176f1f is described below
commit 8176f1f8c868e4bde355bc3e56c82120c8760430
Author: Demyan Mysakovets
AuthorDate: Wed Apr 8 13:01:13 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/scripts/deploy_dlab.py | 2 ++
infrastructure-provisioning/src/general/conf/dlab.ini | 10 +++---
.../src/general/scripts/gcp/odahu_deploy.py| 8 +---
.../src/general/scripts/gcp/odahu_prepare.py | 7 ---
.../src/general/scripts/gcp/odahu_resume.py| 10 ++
.../src/general/scripts/gcp/odahu_suspend.py | 8 +---
.../src/general/scripts/gcp/odahu_terminate.py | 8 +---
7 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py
b/infrastructure-provisioning/scripts/deploy_dlab.py
index 37dfdaa..73eb9d7 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -123,7 +123,9 @@ parser.add_argument('--resource_id', type=str,
default='line_item_resource_id',
parser.add_argument('--odahu_tls_crt', type=str, default='', help='TLS
Certificate for Odahu cluster')
parser.add_argument('--odahu_tls_key', type=str, default='', help='TLS Key for
Odahu cluster')
parser.add_argument('--odahu_docker_private_repo', type=str, default='',
help='Odahu private repository url')
+parser.add_argument('--odahu_docker_password', type=str, default='',
help='Odahu private repository base64 encoded password')
parser.add_argument('--odahu_keysecret', type=str, default='', help='KeySecret
for Odahuflow examples git')
+parser.add_argument('--odahu_oauth_local_jwks', type=str, default='',
help='JWKS from keycloak')
parser.add_argument('--odahu_airflow_secret', type=str, default='',
help='Airflow keycloak service account secret')
parser.add_argument('--odahu_operator_secret', type=str, default='',
help='Operator keycloak service account secret')
parser.add_argument('--odahu_resource_uploader_secret', type=str, default='',
help='Resource uploader keycloak service'
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini
b/infrastructure-provisioning/src/general/conf/dlab.ini
index 0dad5d8..77966ad 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -348,7 +348,7 @@ initial_node_count = 6
###
istio_helm_repo =
https://storage.googleapis.com/istio-release/releases/1.2.2/charts
###
-k8s_version = 1.14.10-gke.24
+k8s_version = 1.14
###
helm_repo = https://raw.githubusercontent.com/odahu/odahu-helm/master
###
@@ -383,16 +383,20 @@ service_cidr = 10.42.128.0/20
dns_project_id = or2-msq-epmc-dlab-t1iylu
###
infra_vpc_peering = 0
-###
-deploy_image =
gcr.io/or2-msq-epmd-legn-t1iylu/odahu/odahu-flow-automation:1.1.0-rc8-dlab
+### Link to Odahuflow deploy image
+deploy_image =
gcr.io/or2-msq-epmd-legn-t1iylu/odahu/odahu-flow-automation:1.1.0
###
opa_policy =
cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL3BhY2thZ2luZy9pbnRlZ3JhdGl
[...]
### TLS Certificate for Odahu cluster
# tls_crt =
### TLS Key for Odahu cluster
# tls_key =
+### Odahu private repository base64 encoded password
+# docker_password =
### KeySecret for Odahuflow examples git
# keysecret =
+### JWKS from keycloak
+# oauth_local_jwks =
### Airflow keycloak service account secret
# airflow_secret =
### Operator keycloak service account secret
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 6beef79..0277d43 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -67,6 +67,7 @@ if __name__ == "__main__":
odahu_conf['project_name'])
odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
odahu_conf['grafana_pass'] = id_generator()
+odahu_conf['docker_password'] =
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 4e73a98 [odahu-integration] Bugfix
new 3c2f0d0 Merge remote-tracking branch 'origin/odahu-integration' into
odahu-integration
4e73a98 is described below
commit 4e73a984f3c9f11ffe7b88e67ff3afbec969ac00
Author: Demyan Mysakovets
AuthorDate: Tue Mar 31 17:38:47 2020 +0300
[odahu-integration] Bugfix
---
.../src/general/scripts/gcp/odahu_deploy.py| 14 +++---
.../src/general/scripts/gcp/odahu_resume.py| 14 +++---
.../src/general/scripts/gcp/odahu_suspend.py | 14 +++---
.../src/general/scripts/gcp/odahu_terminate.py | 14 +++---
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 8ca6051..75c6917 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -225,7 +225,7 @@ if __name__ == "__main__":
"oauth_oidc_scope": "openid profile email offline_access
groups",
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
-"odahu_infra_version":
"{}".format(odahu_conf['nfra_version']),
+"odahu_infra_version":
"{}".format(odahu_conf['infra_version']),
"odahu_ui_version": "{}".format(odahu_conf['ui_version']),
"odahuflow_connection_decrypt_token":
"{}".format(odahu_conf['decrypt_token']),
"odahuflow_connections": [
@@ -248,23 +248,23 @@ if __name__ == "__main__":
"service_accounts": {
"airflow": {
"client_id": "sa-airflow",
-"client_secret":
"{}".format(odahu_conf['sa-airflow_secret'])
+"client_secret":
"{}".format(odahu_conf['airflow_secret'])
},
"operator": {
"client_id": "sa-operator",
-"client_secret":
"{}".format(odahu_conf['sa-operator_secret'])
+"client_secret":
"{}".format(odahu_conf['operator_secret'])
},
"resource_uploader": {
"client_id": "sa-resource-uploader",
-"client_secret":
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+"client_secret":
"{}".format(odahu_conf['resource-uploader_secret'])
},
"test": {
"client_id": "sa-tester",
-"client_secret":
"{}".format(odahu_conf['sa-tester_secret'])
+"client_secret":
"{}".format(odahu_conf['tester_secret'])
},
"test_data_scientist": {
"client_id": "sa-tester-data-scientist",
-"client_secret":
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+"client_secret":
"{}".format(odahu_conf['tester-data-scientist_secret'])
}
},
"service_cidr": "{}".format(odahu_conf['service_cidr']),
@@ -275,7 +275,7 @@ if __name__ == "__main__":
"tls_key": "{}".format(odahu_conf['tls_key']),
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"vault": {
-"enabled": true
+"enabled": "true"
}
}
profile.write(json.dumps(prof))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index 39f5c23..e6fe634 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -228,7 +228,7 @@ if __name__ == "__main__":
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(
odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
-"odahu_infra_version": "{}".format(odahu_conf['nfra_version']),
+
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 1497a08 [odahu-integration] Bugfix
new 8e17faf Merge remote-tracking branch 'origin/odahu-integration' into
odahu-integration
1497a08 is described below
commit 1497a081c07af0e9d530011e2f5028b1b40be7c5
Author: Demyan Mysakovets
AuthorDate: Wed Mar 18 18:41:22 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/files/gcp/ssn_roles.json | 3 ++-
.../src/general/scripts/gcp/odahu_deploy.py| 7 +++
.../src/general/scripts/gcp/odahu_resume.py| 3 ++-
.../src/general/scripts/gcp/odahu_suspend.py | 1 +
.../src/general/scripts/gcp/odahu_terminate.py | 7 +++
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
b/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
index 4da449f..3a72260 100644
--- a/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
+++ b/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
@@ -8,5 +8,6 @@
"compute.instanceAdmin",
"bigquery.dataViewer",
"bigquery.jobUser",
-"container.admin"
+"container.admin",
+"dns.admin"
]
\ No newline at end of file
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 07d1f5c..396fd38 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -44,6 +44,7 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+odahu_conf['edge_user_name'] = os.environ['edge_user_name']
odahu_conf['node_locations'] = GCPMeta().get_available_zones()
odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
@@ -120,6 +121,12 @@ if __name__ == "__main__":
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"subnet_name":
"{}".format(odahu_conf['private_subnet_name']),
"node_locations": odahu_conf['node_locations'],
+"node_labels": {
+"name": "{}".format(odahu_conf['cluster_name']),
+"product": "dlab",
+"user": "{}".format(odahu_conf['edge_user_name']),
+"sbn": "{}".format(odahu_conf['service_base_name'])
+},
"oauth_client_id":
"{}".format(odahu_conf['oauth_client_id']),
"oauth_client_secret":
"{}".format(odahu_conf['oauth_client_secret']),
"oauth_cookie_secret": "OWl6VnV3SHNIQzVyMThqVw==",
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index e1b9536..a74cdd5 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -46,13 +46,14 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+odahu_conf['edge_user_name'] = os.environ['edge_user_name']
odahu_conf['node_locations'] = GCPMeta().get_available_zones()
odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
odahu_conf['odahu_cidr'] = os.environ['odahu_cidr']
odahu_conf['service_base_name'] =
(os.environ['conf_service_base_name']).lower().replace('_', '-')
odahu_conf['project_name'] =
(os.environ['project_name']).lower().replace('_', '-')
-odahu_conf['odahu_cluster_name'] =
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
+odahu_conf['cluster_name'] =
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
odahu_conf['bucket_name'] =
"{}-tfstate".format((os.environ['odahu_cluster_name']).lower().replace('_',
'-'))
odahu_conf['static_address_name'] =
"{}-nat-gw".format((os.environ['odahu_cluster_name']).lower().replace('_', '-'))
try:
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index b96c15e..4736e02 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 74f8966 [odahu-integration] Bugfix
74f8966 is described below
commit 74f89664d023cae8963cab03bf4c73a893b0cbfd
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 19:16:33 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index af5d1c2..ad4ef73 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -89,7 +89,9 @@ def login_in_gcr(gcr_creds, odahu_image, dlab_path):
local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
-sudo('sed -i "s|ODAHU_IMAGE|{}|"
{}general/files/gcp/odahu_Dockerfile'.format(odahu_image, dlab_path))
+sudo('sed -i "s|ODAHU_IMAGE|{}|" '
+
'{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image,
+
dlab_path))
except Exception as err:
traceback.print_exc()
print('Failed to prepare odahu image: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 25a5418 [odahu-integration] Bugfix
25a5418 is described below
commit 25a54183718fba66e8ba4e0eaa8eb3f2db2235b9
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 18:34:42 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 1d932df..8022bad 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -248,7 +248,7 @@ if __name__ == "__main__":
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {}" \
- " --cloud_provider {} --region {} --gcr_creds {}
--odahu_image". \
+ " --cloud_provider {} --region {} --gcr_creds {}
--odahu_image {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'],
os.environ['ssn_dlab_path'],
os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['ssn_gcr_creds'], os.environ['odahu_deploy_image'])
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new cb8fd16 [odahu-integration] Bugfix
cb8fd16 is described below
commit cb8fd16284f87959860149a678f1e95c99dd7d87
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 15:38:46 2020 +0200
[odahu-integration] Bugfix
---
.../src/ssn/scripts/configure_docker.py | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 0146cbe..92ff80e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -81,16 +81,11 @@ def add_china_repository(dlab_path):
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
def login_in_gcr(gcr_creds):
-try:
-with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
-f.write(gcr_creds)
-local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
-sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
-sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
-except Exception as err:
-traceback.print_exc()
-print('Failed to prepare odahu image: ', str(err))
-sys.exit(1)
+with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
+f.write(gcr_creds)
+local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
+sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
+sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
def build_docker_images(image_list, region, dlab_path):
try:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new f0b6218 [odahu-integration] Bugfix
f0b6218 is described below
commit f0b62180f34049eb8c669be84c50263d98e46275
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 15:08:24 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index b640e0e..0146cbe 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -87,7 +87,6 @@ def login_in_gcr(gcr_creds):
local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
-sudo('rm /tmp/dlab-gcr-ro-sa.json')
except Exception as err:
traceback.print_exc()
print('Failed to prepare odahu image: ', str(err))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 58d11dd [odahu-integration] Bugfix
58d11dd is described below
commit 58d11ddbe19590c43c5dd69a551dd0b832598b67
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 14:46:29 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index a3e4e46..b640e0e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -83,7 +83,7 @@ def add_china_repository(dlab_path):
def login_in_gcr(gcr_creds):
try:
with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
-f.write(json.dumps(gcr_creds))
+f.write(gcr_creds)
local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 4ca3b25 [odahu-integration] Bugfix
4ca3b25 is described below
commit 4ca3b2553f2cb8ca89c67200adb9e376973eea51
Author: Demyan Mysakovets
AuthorDate: Tue Mar 17 14:04:08 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index b4bb1db..a3e4e46 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -81,11 +81,11 @@ def add_china_repository(dlab_path):
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
def login_in_gcr(gcr_creds):
-decoded_creds = base64.b64decode(gcr_creds + "==")
try:
-with open('/tmp/dlab-gcr-ro-sa.json', 'w') as f:
-f.write(json.dumps(decoded_creds))
-local('scp -i {} /tmp/dlab-gcr-ro-sa.json
{}:/tmp/dlab-gcr-ro-sa.json'.format(args.keyfile, env.host_string))
+with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
+f.write(json.dumps(gcr_creds))
+local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
+sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
sudo('rm /tmp/dlab-gcr-ro-sa.json')
except Exception as err:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 4b6a7ca [odahu-integration] Bugfix
4b6a7ca is described below
commit 4b6a7cab08bcf76391b7c986f4ca6fecd7acfdd3
Author: Demyan Mysakovets
AuthorDate: Mon Mar 16 19:05:03 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index f0a7989..b4bb1db 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -85,6 +85,7 @@ def login_in_gcr(gcr_creds):
try:
with open('/tmp/dlab-gcr-ro-sa.json', 'w') as f:
f.write(json.dumps(decoded_creds))
+local('scp -i {} /tmp/dlab-gcr-ro-sa.json
{}:/tmp/dlab-gcr-ro-sa.json'.format(args.keyfile, env.host_string))
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
sudo('rm /tmp/dlab-gcr-ro-sa.json')
except Exception as err:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 33f86a4 [odahu-integration] Bugfix
33f86a4 is described below
commit 33f86a499d902f57cd6f3762823455671c0c8d88
Author: Demyan Mysakovets
AuthorDate: Mon Mar 16 17:55:22 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 3bb6b96..f0a7989 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -190,7 +190,7 @@ if __name__ == "__main__":
sys.exit(1)
print("Login in Google Container Registry")
-if not login_in_gcre(args.gcr_creds):
+if not login_in_gcr(args.gcr_creds):
sys.exit(1)
print("Building dlab images")
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new db7ad1d [odahu-integration] Bugfix
db7ad1d is described below
commit db7ad1d74ae1612572f4a1d2ad66abf2f5413332
Author: Demyan Mysakovets
AuthorDate: Mon Mar 16 17:11:14 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/lib/gcp/meta_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
index e8971a4..b75f0a8 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
@@ -54,7 +54,7 @@ class GCPMeta:
['https://www.googleapis.com/auth/compute',
'https://www.googleapis.com/auth/iam',
'https://www.googleapis.com/auth/cloud-platform'])
-self.[]
+self.service = build('compute', 'v1', credentials=credentials)
self.service_iam = build('iam', 'v1', credentials=credentials)
self.dataproc = build('dataproc', 'v1', credentials=credentials)
self.service_storage = build('storage', 'v1',
credentials=credentials)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new c754988 [odahu-integration] Bugfix
c754988 is described below
commit c7549883508d4b6338dfda8730d5d17e98b974a6
Author: Demyan Mysakovets
AuthorDate: Mon Mar 16 16:56:33 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/scripts/deploy_dlab.py | 1 -
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 4 ++--
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 +++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py
b/infrastructure-provisioning/scripts/deploy_dlab.py
index d18a7ed..8bebb61 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -142,7 +142,6 @@ parser.add_argument('--billing_dataset_name', type=str,
default='', help='Name o
' for
billing')
parser.add_argument('--default_endpoint_name', type=str, default='local',
help='Name of localhost provisioning service,'
'that created by default')
-parser.add_argument('--ssn_gcr_username', type=str, default='_json_key',
help='Username for GCR authentication')
parser.add_argument('--ssn_gcr_creds', type=str, default='', help='Base64
encrypted json key for GCR authentication')
parser.add_argument('--conf_stepcerts_enabled', type=str, default='false',
help='Enable or disable step certificates')
parser.add_argument('--conf_stepcerts_root_ca', type=str, default='',
help='Step root CA')
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index eca36a3..cb0bdd6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -247,10 +247,10 @@ if __name__ == "__main__":
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
-params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--nexus_username {} --nexus_password {} --nexus_url {}". \
+params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--gcr_creds {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'],
os.environ['ssn_dlab_path'],
- os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['nexus_username'], os.environ['nexus_password'],
os.environ['ssn_nexus_url'])
+ os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['ssn_gcr_creds'])
try:
local("~/scripts/{}.py {}".format('configure_docker', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 88d6f75..3bb6b96 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -28,6 +28,7 @@ import sys
from dlab.ssn_lib import *
import os
import time
+import base64
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
@@ -80,9 +81,10 @@ def add_china_repository(dlab_path):
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
def login_in_gcr(gcr_creds):
+decoded_creds = base64.b64decode(gcr_creds + "==")
try:
with open('/tmp/dlab-gcr-ro-sa.json', 'w') as f:
-f.write(json.dumps(gcr_creds))
+f.write(json.dumps(decoded_creds))
sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
sudo('rm /tmp/dlab-gcr-ro-sa.json')
except Exception as err:
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 7373ba7 [odahu-integration] Bugfix
7373ba7 is described below
commit 7373ba776789c66f0e5f2fe48f82f9ceeb45cda1
Author: Demyan Mysakovets
AuthorDate: Fri Jan 31 11:57:01 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 3223e51..6893312 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -39,6 +39,7 @@ parser.add_argument('--dlab_path', type=str, default='')
parser.add_argument('--cloud_provider', type=str, default='')
parser.add_argument('--resource', type=str, default='')
parser.add_argument('--region', type=str, default='')
+parser.add_argument('--ssn_nexus_url', type=str, default='')
args = parser.parse_args()
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new be8b5c6 [odahu-integration] Bugfix
be8b5c6 is described below
commit be8b5c624ec63e141d03f5795b3b4c73327403f4
Author: Demyan Mysakovets
AuthorDate: Thu Jan 30 17:54:55 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index c2fbc4a..6362786 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -234,7 +234,7 @@ if __name__ == "__main__":
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
-params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--ssn_nexus_url{}". \
+params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--ssn_nexus_url {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'],
os.environ['ssn_dlab_path'],
os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['ssn_nexus_url'])
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 04a5fad [odahu-integration] Bugfix
04a5fad is described below
commit 04a5fad4bb68dd3149dc3f75544adc851390be4f
Author: Demyan Mysakovets
AuthorDate: Thu Jan 30 17:42:55 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 4 ++--
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py| 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index ef6f8ca..c2fbc4a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -191,9 +191,9 @@ if __name__ == "__main__":
"service_base_name":
ssn_conf['service_base_name'],
"security_group_id": ssn_conf['firewall_name'],
"vpc_id": ssn_conf['vpc_name'],
"subnet_id": ssn_conf['subnet_name'],
"admin_key": os.environ['conf_key_name']}
-params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {} --ssn_nexus_url {}". \
+params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
- ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
+ ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'])
try:
local("~/scripts/{}.py {}".format('configure_ssn_node', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 8c3b541..528840e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -37,7 +37,6 @@ parser.add_argument('--additional_config', type=str,
default='{"empty":"string"}
parser.add_argument('--os_user', type=str, default='')
parser.add_argument('--dlab_path', type=str, default='')
parser.add_argument('--tag_resource_id', type=str, default='')
-parser.add_argument('--ssn_nexus_url', type=str, default='')
args = parser.parse_args()
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 36056b7 [odahu-integration] Bugfix
36056b7 is described below
commit 36056b720237f8ebbb65133294bc00346c446b4a
Author: Demyan Mysakovets
AuthorDate: Thu Jan 30 17:27:15 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 2ac2e96..ef6f8ca 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -193,7 +193,7 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"admin_key": os.environ['conf_key_name']}
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {} --ssn_nexus_url {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
- ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'])
+ ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
try:
local("~/scripts/{}.py {}".format('configure_ssn_node', params))
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 5650fb1 [odahu-integration] Bugfix
5650fb1 is described below
commit 5650fb199feb6fafc86ce894d61d54c1035a2c25
Author: Demyan Mysakovets
AuthorDate: Thu Jan 30 16:54:43 2020 +0200
[odahu-integration] Bugfix
---
.../src/general/scripts/gcp/ssn_configure.py| 6 +++---
.../src/ssn/scripts/configure_docker.py | 21 +
.../src/ssn/scripts/configure_ssn_node.py | 21 -
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index f7a4e8d..2ac2e96 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -193,7 +193,7 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"admin_key": os.environ['conf_key_name']}
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {} --ssn_nexus_url {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
- ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
+ ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'])
try:
local("~/scripts/{}.py {}".format('configure_ssn_node', params))
@@ -234,10 +234,10 @@ if __name__ == "__main__":
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
-params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}". \
+params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--ssn_nexus_url{}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'],
os.environ['ssn_dlab_path'],
- os.environ['conf_cloud_provider'], ssn_conf['region'])
+ os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['ssn_nexus_url'])
try:
local("~/scripts/{}.py {}".format('configure_docker', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 7176c8b..3223e51 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -76,6 +76,24 @@ def add_china_repository(dlab_path):
sudo('sed -i "/pip install/s/jupyter/ipython==5.0.0 jupyter==1.0.0/g"
Dockerfile')
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
+def prepare_odahu_image(ssn_nexus_url, dlab_path):
+try:
+put('/root/templates/daemon.json', '/etc/docker/daemon.json',
use_sudo=True)
+print('daemon.json was placed')
+# sudo('mv daemon.json /etc/docker/daemon.json')
+# print ('daemon.json was moved')
+sudo("sed -i \'s||{}|g\'
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
+print('nexus url was filled in')
+sudo('systemctl restart docker')
+sudo(
+"sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(
+ssn_nexus_url, dlab_path))
+#sudo("sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
+# format(os.environ['odahu_docker_private_repo'],
os.environ['ssn_dlab_path']))
+except Exception as err:
+traceback.print_exc()
+print('Failed to prepare odahu image: ', str(err))
+sys.exit(1)
def build_docker_images(image_list, region, dlab_path):
try:
@@ -173,6 +191,9 @@ if __name__ == "__main__":
if not ensure_docker_daemon(args.dlab_path, args.os_user, args.region):
sys.exit(1)
+print("Preparing odahu image")
+prepare_odahu_image(args.ssn_nexus_url, args.dlab_path)
+
print("Building dlab images")
if not build_docker_images(deeper_config, args.region, args.dlab_path):
sys.exit(1)
diff --git
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 066ebf1 [odahu-integration] Bugfix
066ebf1 is described below
commit 066ebf137d1c8080559c1ee19184fb7976dbd835
Author: Demyan Mysakovets
AuthorDate: Wed Jan 29 16:19:35 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 2f0617f..4ce1d06 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -223,4 +223,4 @@ if __name__ == "__main__":
docker_build_script()
print("Preparing odahu image")
-prepare_odahu_image(ssn_nexus_url, dlab_path)
\ No newline at end of file
+prepare_odahu_image(args.ssn_nexus_url, args.dlab_path)
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 9b6ef03 [odahu-integration] Bugfix
9b6ef03 is described below
commit 9b6ef03f576710d5afbea495c76424ad2c3a1d2d
Author: Demyan Mysakovets
AuthorDate: Wed Jan 29 15:46:54 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index d68f1a6..2f0617f 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -220,4 +220,7 @@ if __name__ == "__main__":
ensure_ciphers()
print("Configuring docker_build script")
-docker_build_script()
\ No newline at end of file
+docker_build_script()
+
+print("Preparing odahu image")
+prepare_odahu_image(ssn_nexus_url, dlab_path)
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch odahu-integration updated: [odahu-integration] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 7d977b9 [odahu-integration] Bugfix
7d977b9 is described below
commit 7d977b9cd84ffba060b95da7c40bc6914a6c9eed
Author: Demyan Mysakovets
AuthorDate: Wed Jan 29 15:25:15 2020 +0200
[odahu-integration] Bugfix
---
.../src/general/scripts/gcp/ssn_configure.py | 10 ++
.../src/ssn/scripts/configure_ssn_node.py| 16
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 69dcae1..f7a4e8d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -191,9 +191,9 @@ if __name__ == "__main__":
"service_base_name":
ssn_conf['service_base_name'],
"security_group_id": ssn_conf['firewall_name'],
"vpc_id": ssn_conf['vpc_name'],
"subnet_id": ssn_conf['subnet_name'],
"admin_key": os.environ['conf_key_name']}
-params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {}". \
+params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {} --ssn_nexus_url {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
- ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'])
+ ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
try:
local("~/scripts/{}.py {}".format('configure_ssn_node', params))
@@ -240,12 +240,6 @@ if __name__ == "__main__":
os.environ['conf_cloud_provider'], ssn_conf['region'])
try:
-put('/root/templates/daemon.json', '/etc/docker/daemon.json')
-sudo("sed -i \'s||{}|g\'
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
-sudo('systemctl restart docker')
-sudo("sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(os.environ['ssn_nexus_url'],
os.environ['ssn_dlab_path']))
-#sudo("sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
-# format(os.environ['odahu_docker_private_repo'],
os.environ['ssn_dlab_path']))
local("~/scripts/{}.py {}".format('configure_docker', params))
except:
traceback.print_exc()
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index d5c454f..d68f1a6 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -37,6 +37,7 @@ parser.add_argument('--additional_config', type=str,
default='{"empty":"string"}
parser.add_argument('--os_user', type=str, default='')
parser.add_argument('--dlab_path', type=str, default='')
parser.add_argument('--tag_resource_id', type=str, default='')
+parser.add_argument('--ssn_nexus_url', type=str, default='')
args = parser.parse_args()
@@ -146,6 +147,21 @@ def docker_build_script():
print('Failed to configure docker_build script: ', str(err))
sys.exit(1)
+def prepare_odahu_image(ssn_nexus_url, dlab_path):
+try:
+put('/root/templates/daemon.json', '/etc/docker/daemon.json')
+sudo("sed -i \'s||{}|g\'
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
+sudo('systemctl restart docker')
+sudo(
+"sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(
+ssn_nexus_url, dlab_path))
+#sudo("sed -i \'s||{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
+# format(os.environ['odahu_docker_private_repo'],
os.environ['ssn_dlab_path']))
+except Exception as err:
+traceback.print_exc()
+print('Failed to prepare odahu image: ', str(err))
+sys.exit(1)
+
##
# Run script #
##
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
