This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new eacd5d4 fixed typo
eacd5d4 is described below
commit eacd5d4e82d4fced328c070b716c2a83f1feceeb
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Apr 3 13:56:58 2019 +0300
fixed typo
---
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/ssn/scripts/configure_conf_file.py | 16 ----------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index df8d42e..beb4a6e 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -67,7 +67,7 @@ if __name__ == "__main__":
in os.environ and 'local_repository_user_password' in
os.environ:
basic_auth_repos = ('apt_bintray_repo',
'apt_ubuntu_security_repo', 'apt_ubuntu_repo', 'docker_repo',
'jenkins_repo', 'maven_bintray_repo',
'mongo_repo', 'pypi_repo',
- 'packages_repo', 'r_repo', 'rrutter_repo')
+ 'packages_repo', 'r_repo', 'rrutter_repo',
'apt_ubuntu_canonical_repo')
for repo in basic_auth_repos:
os.environ['local_repository_{}'.format(repo)] =
os.environ['local_repository_{}'.format(
repo)].replace('{}://'.format(os.environ['local_repository_{}'.format(repo)].split(':')[0]),
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
b/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
index 1bee6b1..10c5787 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
@@ -38,9 +38,6 @@ def modify_conf_file():
try:
variables_list = json.loads(args.variables_list)
conf_list = []
- basic_auth_repos = ('apt_bintray_repo', 'apt_ubuntu_security_repo',
'apt_ubuntu_repo', 'docker_repo',
- 'jenkins_repo', 'maven_bintray_repo',
'maven_central_repo', 'mongo_repo', 'pypi_repo',
- 'packages_repo', 'r_repo', 'rrutter_repo')
conf_file =
open('{}sources/infrastructure-provisioning/src/general/conf/dlab.ini'.format(args.dlab_dir),
'r')
for line in conf_file:
conf_list.append(line)
@@ -63,19 +60,6 @@ def modify_conf_file():
except:
print('Such variable doesn`t exist!')
config.remove_option(section, option)
- # if section == 'local_repository' and 'repository_user_name' in
options and 'repository_user_password' in \
- # options:
- # for option in options:
- # if option in basic_auth_repos:
- # repo_url = config.get(section, option)
- # updated_repo_url =
repo_url.replace('{}://'.format(repo_url.split(':')[0]),
- #
'{0}://{1}:{2}@'.format(
- #
repo_url.split(':')[0],
- #
config.get(section, 'repository_user_name'),
- #
config.get(section,
- #
'repository_user_password')))
- # config.set(section, option, updated_repo_url)
-
with
open('{}sources/infrastructure-provisioning/src/general/conf/overwrite.ini'.format(
args.dlab_dir), 'w') as conf_file_final:
config.write(conf_file_final)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
