[DLAB-656] Prepare docker images for MongoDB/UI/Billing services
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 9079c99..84c6a9a 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -175,7 +175,7 @@
locale, region_info, ldap_login, tenant_id,
application_id, hostname, data_lake_name, subscription_id,
validate_permission_scope, dlab_id, usage_date, product,
- usage_type, usage, cost, resource_id, tags, report_path=''):
+ usage_type, usage, cost, resource_id, tags, report_path='', k8s=False):
try:
if not exists(os.environ['ssn_dlab_path'] + 'tmp/ss_started'):
java_path = sudo("update-alternatives --query java | grep 'Value: ' | grep -o '/.*/jre'")
@@ -281,7 +281,7 @@
except:
append_result("Unable to generate cert and copy to java keystore")
sys.exit(1)
- if kuber_enabled:
+ if k8s:
try:
dlab_source_dir = '{}sources/infrastructure-provisioning/src/'.format(dlab_path)
k8s_dir = '{}tmp-kuber/'.format(dlab_source_dir)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py b/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
index 1a0cbab..301b228 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
@@ -36,7 +36,7 @@
parser.add_argument('--dlab_path', type=str, default='')
parser.add_argument('--mongo_parameters', type=str, default='')
parser.add_argument('--cloud_provider', type=str, default='')
-parser.add_argument('--kuber', type=str, default=True)
+parser.add_argument('--k8s', type=str, default=False)
args = parser.parse_args()
@@ -81,7 +81,7 @@
# Setting up admin's password and enabling security
client = MongoClient(mongo_ip + ':' + str(mongo_port))
pass_upd = True
- if args.kuber:
+ if args.k8s:
local("cd {}sources/infrastructure-provisioning/src/; docker build --build-arg CLOUD_PROVIDER={} --file ssn/files/os/mongo_Dockerfile -t docker.dlab-mongo ."
.format(args.dlab_path, args.cloud_provider))
local("mkdir -p /opt/mongo_vol")
