You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/06 14:24:48 UTC
[incubator-dlab] branch bil-2 updated (bcbb751 -> f79696d)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch bil-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard bcbb751 DLAB-23 removed copping billing jar
new f79696d DLAB-23 removed copping billing jar
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bcbb751)
\
N -- N -- N refs/heads/bil-2 (f79696d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: DLAB-23 removed copping billing jar
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch bil-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f79696db68977a2614d54a766f95c4b1c0537890
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Sep 6 14:57:17 2019 +0300
DLAB-23 removed copping billing jar
---
.../src/general/lib/os/debian/ssn_lib.py | 4 +-
.../src/general/lib/os/redhat/ssn_lib.py | 52 +---------------------
.../src/ssn/scripts/configure_ui.py | 7 +--
.../src/ssn/templates/supervisor_svc.conf | 10 -----
.../webapp/src/dictionary/global.dictionary.ts | 4 +-
5 files changed, 6 insertions(+), 71 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 73b0a85..637d014 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -204,7 +204,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
try:
sudo('mkdir -p /var/log/application')
run('mkdir -p /tmp/yml_tmp/')
- for service in ['self-service', 'security-service', 'provisioning-service', 'billing']:
+ for service in ['self-service', 'security-service', 'provisioning-service']:
jar = sudo('cd {0}{1}/lib/; find {1}*.jar -type f'.format(web_path, service))
sudo('ln -s {0}{2}/lib/{1} {0}{2}/{2}.jar '.format(web_path, jar, service))
sudo('cp {0}/webapp/{1}/conf/*.yml /tmp/yml_tmp/'.format(dlab_path, service))
@@ -283,7 +283,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
cost,
resource_id,
tags)
- sudo('python /tmp/configure_billing.py {}'.format(params))
+ #sudo('python /tmp/configure_billing.py {}'.format(params))
try:
sudo('keytool -genkeypair -alias dlab -keyalg RSA -validity 730 -storepass {1} -keypass {1} \
-keystore /home/{0}/keys/dlab.keystore.jks -keysize 2048 -dname "CN=localhost"'.format(os_user, keystore_passwd))
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 22bb59d..cdcafee 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -230,7 +230,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
try:
sudo('mkdir -p /var/log/application')
run('mkdir -p /tmp/yml_tmp/')
- for service in ['self-service', 'security-service', 'provisioning-service', 'billing']:
+ for service in ['self-service', 'security-service', 'provisioning-service']:
jar = sudo('cd {0}{1}/lib/; find {1}*.jar -type f'.format(web_path, service))
sudo('ln -s {0}{2}/lib/{1} {0}{2}/{2}.jar '.format(web_path, jar, service))
sudo('cp {0}/webapp/{1}/conf/*.yml /tmp/yml_tmp/'.format(dlab_path, service))
@@ -264,56 +264,6 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
append_result("Unable to upload webapp jars. ", str(err))
sys.exit(1)
- if billing_enabled:
- local('scp -i {} /root/scripts/configure_billing.py {}:/tmp/configure_billing.py'.format(keyfile,
- host_string))
- params = '--cloud_provider {} ' \
- '--infrastructure_tag {} ' \
- '--tag_resource_id {} ' \
- '--billing_tag {} ' \
- '--account_id {} ' \
- '--billing_bucket {} ' \
- '--aws_job_enabled {} ' \
- '--report_path "{}" ' \
- '--mongo_password {} ' \
- '--dlab_dir {} ' \
- '--authentication_file "{}" ' \
- '--offer_number {} ' \
- '--currency {} ' \
- '--locale {} ' \
- '--region_info {} ' \
- '--dlab_id {} ' \
- '--usage_date {} ' \
- '--product {} ' \
- '--usage_type {} ' \
- '--usage {} ' \
- '--cost {} ' \
- '--resource_id {} ' \
- '--tags {}'.\
- format(cloud_provider,
- service_base_name,
- tag_resource_id,
- billing_tag,
- account_id,
- billing_bucket,
- aws_job_enabled,
- report_path,
- mongo_passwd,
- dlab_path,
- authentication_file,
- offer_number,
- currency,
- locale,
- region_info,
- dlab_id,
- usage_date,
- product,
- usage_type,
- usage,
- cost,
- resource_id,
- tags)
- sudo('python /tmp/configure_billing.py {}'.format(params))
try:
sudo('keytool -genkeypair -alias dlab -keyalg RSA -validity 730 -storepass {1} -keypass {1} \
-keystore /home/{0}/keys/dlab.keystore.jks -keysize 2048 -dname "CN=localhost"'.format(
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 23b4329..cc4453a 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -150,7 +150,7 @@ def build_ui():
sudo('/opt/maven/bin/mvn -P{} -DskipTests package'.format(args.cloud_provider))
sudo('mkdir -p {}/webapp/'.format(args.dlab_path))
- for service in ['self-service', 'security-service', 'provisioning-service', 'billing']:
+ for service in ['self-service', 'security-service', 'provisioning-service']:
sudo('mkdir -p {}/webapp/{}/lib/'.format(args.dlab_path, service))
sudo('mkdir -p {}/webapp/{}/conf/'.format(args.dlab_path, service))
sudo('cp {0}/sources/services/self-service/self-service.yml {0}/webapp/self-service/conf/'.format(
@@ -186,11 +186,6 @@ def build_ui():
sudo(
'cp {0}/sources/services/billing-aws/target/billing-aws*.jar {0}/webapp/billing/lib/'.format(
args.dlab_path))
- elif args.cloud_provider == 'gcp':
- sudo('cp {0}/sources/services/billing-gcp/billing.yml {0}/webapp/billing/conf/'.format(args.dlab_path))
- sudo(
- 'cp {0}/sources/services/billing-gcp/target/billing-gcp*.jar {0}/webapp/billing/lib/'.format(
- args.dlab_path))
except Exception as err:
traceback.print_exc()
print('Failed to build UI: ', str(err))
diff --git a/infrastructure-provisioning/src/ssn/templates/supervisor_svc.conf b/infrastructure-provisioning/src/ssn/templates/supervisor_svc.conf
index f835067..db94bd6 100644
--- a/infrastructure-provisioning/src/ssn/templates/supervisor_svc.conf
+++ b/infrastructure-provisioning/src/ssn/templates/supervisor_svc.conf
@@ -52,14 +52,4 @@ priority=20
user=OS_USR
stdout_logfile=/var/log/application/provision-service.log
redirect_stderr=true
-environment=DLAB_CONF_DIR="WEB_CONF"
-
-[program:billing]
-command=java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 billing/billing.jar --conf WEB_CONFbilling.yml
-directory=WEB_APP_DIR
-autorestart=true
-priority=20
-user=OS_USR
-stdout_logfile=/var/log/application/billing.log
-redirect_stderr=true
environment=DLAB_CONF_DIR="WEB_CONF"
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
index 6d0d8ea..31b86c6 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
@@ -19,8 +19,8 @@
// from './{{ aws | gcp | azure }}.dictionary';
-import { NAMING_CONVENTION } from './CLOUD_PROVIDER.dictionary';
+import { NAMING_CONVENTION } from './gcp.dictionary';
-export * from './CLOUD_PROVIDER.dictionary';
+export * from './gcp.dictionary';
export const DICTIONARY = Object.freeze(NAMING_CONVENTION);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org