[incubator-dlab] branch DLAB-657 updated: fix+redhat version
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-657
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-657 by this push:
new 577b815 fix+redhat version
577b815 is described below
commit 577b815147be5c5e7c034c2f95793bf04cc841b9
Author: Oleksandr_Isniuk
AuthorDate: Wed Jun 5 11:14:50 2019 +0300
fix+redhat version
---
.../src/general/lib/os/debian/ssn_lib.py | 4 +-
.../src/general/lib/os/redhat/ssn_lib.py | 4 +-
.../files/aws => ssn/files/os}/billing_Dockerfile | 0
.../src/ssn/files/os/create_db.js | 8
.../files/os/mongo_Dockerfile} | 24 +---
.../src/ssn/files/os/mongodb.conf | 42
.../files/aws => ssn/files/os}/webui_Dockerfile| 0
.../src/ssn/scripts/configure_mongo.py | 45 ++
.../src/ssn/scripts/configure_ui.py| 4 +-
9 files changed, 94 insertions(+), 37 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index eef8b25..9079c99 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -292,9 +292,9 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sudo("cp -r {0}webapp/provisioning-service/lib/*.jar
{1}".format(dlab_path, k8s_dir))
sudo("cp -r {0}webapp/billing/lib/*.jar
{1}".format(dlab_path, k8s_dir))
sudo('sed -i "s|ssn.yml|/root/ssn.yml|g"
{}self-service.yml'.format(k8s_dir))
-sudo("cd {}; docker build --file
general/files/aws/webui_Dockerfile -t docker.dlab-ui ."
+sudo("cd {}; docker build --file
ssn/files/os/webui_Dockerfile -t docker.dlab-ui ."
.format(dlab_source_dir))
-sudo("cd {}; docker build --file
general/files/aws/billing_Dockerfile -t docker.dlab-billing ."
+sudo("cd {}; docker build --file
ssn/files/os/billing_Dockerfile -t docker.dlab-billing ."
.format(dlab_source_dir))
sudo("rm -rf {}".format(k8s_dir))
except Exception as err:
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 502e8c8..9d22c73 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -323,9 +323,9 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sudo("cp -r {0}webapp/provisioning-service/lib/*.jar
{1}".format(dlab_path, k8s_dir))
sudo("cp -r {0}webapp/billing/lib/*.jar
{1}".format(dlab_path, k8s_dir))
sudo('sed -i "s|ssn.yml|/root/ssn.yml|g"
{}self-service.yml'.format(k8s_dir))
-sudo("cd {}; docker build --file
general/files/aws/webui_Dockerfile -t docker.dlab-ui ."
+sudo("cd {}; docker build --file
ssn/files/os/webui_Dockerfile -t docker.dlab-ui ."
.format(dlab_source_dir))
-sudo("cd {}; docker build --file
general/files/aws/billing_Dockerfile -t docker.dlab-billing ."
+sudo("cd {}; docker build --file
ssn/files/os/billing_Dockerfile -t docker.dlab-billing ."
.format(dlab_source_dir))
sudo("rm -rf {}".format(k8s_dir))
except Exception as err:
diff --git
a/infrastructure-provisioning/src/general/files/aws/billing_Dockerfile
b/infrastructure-provisioning/src/ssn/files/os/billing_Dockerfile
similarity index 100%
copy from infrastructure-provisioning/src/general/files/aws/billing_Dockerfile
copy to infrastructure-provisioning/src/ssn/files/os/billing_Dockerfile
diff --git a/infrastructure-provisioning/src/ssn/files/os/create_db.js
b/infrastructure-provisioning/src/ssn/files/os/create_db.js
new file mode 100644
index 000..96163d2
--- /dev/null
+++ b/infrastructure-provisioning/src/ssn/files/os/create_db.js
@@ -0,0 +1,8 @@
+use dlabdb
+db.createUser(
+{
+ user: "admin",
+ pwd: "PASSWORD",
+ roles: [{'role':'userAdminAnyDatabase','db':'admin'}]
+}
+);
diff --git
a/infrastructure-provisioning/src/general/files/aws/billing_Dockerfile
b/infrastructure-provisioning/src/ssn/files/os/mongo_Dockerfile
similarity index 64%
rename from infrastructure-provisioning/src/general/files/aws/billing_Dockerfile
rename to infrastructure-provisioning/src/ssn/files/os/mongo_Dockerfile
index c0952c4..39ab400 100644
--- a/infrastructure-provisioning/src/general/files/aws/billing_Dockerfile
+++
[incubator-dlab] branch DLAB-657 updated: fix+redhat version
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-657
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-657 by this push:
new 9e97347 fix+redhat version
9e97347 is described below
commit 9e973471b9ef7fe4cf69bd8a7db9b0120fd00b05
Author: Oleksandr_Isniuk
AuthorDate: Mon May 27 17:55:53 2019 +0300
fix+redhat version
---
.../src/general/lib/os/debian/common_lib.py| 2 +-
.../src/general/lib/os/debian/ssn_lib.py | 22 +-
.../src/general/lib/os/redhat/ssn_lib.py | 49 +++---
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 2cc64a8..b4a5ca5 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -64,7 +64,7 @@ def change_pkg_repos():
sudo('touch /tmp/pkg_china_ensured')
-def find_java_path_remote():
+def update-alternatives --query java | grep 'Value: ' | grep -o '/.*/jre'():
java_path = sudo("sh -c \"update-alternatives --query java | grep 'Value:
' | grep -o '/.*/jre'\"")
return java_path
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index eac937e..eef8b25 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -296,6 +296,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
.format(dlab_source_dir))
sudo("cd {}; docker build --file
general/files/aws/billing_Dockerfile -t docker.dlab-billing ."
.format(dlab_source_dir))
+sudo("rm -rf {}".format(k8s_dir))
except Exception as err:
traceback.print_exc()
print('Failed to build images for services: ', str(err))
@@ -321,27 +322,6 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
print('Failed to start Self-service: ', str(err))
sys.exit(1)
-
-def create_kuber_images(dlab_path):
-try:
-dlab_source_dir =
'{}sources/infrastructure-provisioning/src/'.format(dlab_path)
-k8s_dir = '{}tmp-kuber/'.format(dlab_source_dir)
-sudo("mkdir {}".format(k8s_dir))
-sudo("cp -r {0}conf/ {1}".format(dlab_path))
-sudo("cp -r {0}webapp/self-service/lib/*.jar {1}".format(dlab_path,
k8s_dir))
-sudo("cp -r {0}webapp/security-service/lib/*.jar
{1}".format(dlab_path, k8s_dir))
-sudo("cp -r {0}webapp/provisioning-service/lib/*.jar
{1}".format(dlab_path, k8s_dir))
-sudo("cp -r {0}webapp/billing/lib/*.jar {1}".format(dlab_path,
k8s_dir))
-sudo('sed -i "s|ssn.yml|/root/ssn.yml|g"
{}self-service.yml'.format(k8s_dir))
-sudo("cd {}; docker build --file general/files/aws/webui_Dockerfile -t
docker.dlab-ui .".format(dlab_source_dir))
-sudo("cd {}; docker build --file general/files/aws/billing_Dockerfile
-t docker.dlab-billing ."
- .format(dlab_source_dir))
-
-except Exception as err:
-traceback.print_exc()
-print('Failed to build images for Kubernetes', str(err))
-sys.exit(1)
-
def install_build_dep():
try:
if not
exists('{}tmp/build_dep_ensured'.format(os.environ['ssn_dlab_path'])):
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 164dfc5..502e8c8 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -216,17 +216,6 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sudo('mv /tmp/ssn.yml ' + os.environ['ssn_dlab_path'] + 'conf/')
put('/root/templates/proxy_location_webapp_template.conf',
'/tmp/proxy_location_webapp_template.conf')
sudo('mv /tmp/proxy_location_webapp_template.conf ' +
os.environ['ssn_dlab_path'] + 'tmp/')
-with open('/root/templates/supervisor_svc.conf', 'r') as f:
-text = f.read()
-text = text.replace('WEB_CONF', dlab_conf_dir).replace('OS_USR',
os_user)
-with open('/root/templates/supervisor_svc.ini', 'w') as f:
-f.write(text)
-put('/root/templates/supervisor_svc.ini',
'/tmp/supervisor_svc.ini')
-sudo('mv /tmp/supervisor_svc.ini ' + os.environ['ssn_dlab_path'] +
'tmp/')
-sudo('cp ' + os.environ['ssn_dlab_path'] +
- 'tmp/proxy_location_webapp_template.conf
