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 0063fb6a54c1ebed9c3ccac449cef34ad236cf3d Author: bhliva <[email protected]> AuthorDate: Fri Sep 6 14:57:17 2019 +0300 DLAB-23 removed copping billing jar --- infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +- infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 5 ----- .../src/main/resources/webapp/src/dictionary/global.dictionary.ts | 4 ++-- 3 files changed, 3 insertions(+), 8 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..436c06f 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py @@ -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/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py index 23b4329..7567e0f 100644 --- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py +++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py @@ -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/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: [email protected] For additional commands, e-mail: [email protected]
