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
The following commit(s) were added to refs/heads/bil-2 by this push:
new 3d4e0cd DLAB-23 removed copping billing jar
3d4e0cd is described below
commit 3d4e0cd4fdbda939b8645f495bd12cc0853b669e
Author: bhliva <[email protected]>
AuthorDate: Fri Sep 6 14:57:17 2019 +0300
DLAB-23 removed copping billing jar
---
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 8 ++++----
.../src/main/resources/webapp/src/dictionary/global.dictionary.ts | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 23b4329..3b4b340 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -187,10 +187,10 @@ def build_ui():
'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))
+ #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]