You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/10/09 10:24:18 UTC
[incubator-dlab] 03/03: Added Endpoint name to shared-bucket for
GCP, added local Endpoint.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6bb38d48cfa7e4e09f81da2ead7f939887a6a184
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Wed Oct 9 13:23:58 2019 +0300
Added Endpoint name to shared-bucket for GCP, added local Endpoint.
---
infrastructure-provisioning/scripts/deploy_dlab.py | 2 ++
.../src/general/files/os/local_endpoint.json | 6 +++---
.../src/general/scripts/gcp/edge_configure.py | 4 +++-
.../src/general/scripts/gcp/project_prepare.py | 4 +++-
.../src/general/scripts/gcp/ssn_configure.py | 10 +++++++---
.../src/general/scripts/gcp/ssn_prepare.py | 4 +++-
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 6 ++++--
7 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index 342e696..addac81 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -132,6 +132,8 @@ parser.add_argument('--tags', type=str, default='line_item_operation,line_item_l
'contains tags')
parser.add_argument('--billing_dataset_name', type=str, default='', help='Name of GCP dataset (BigQuery service)'
' for billing')
+parser.add_argument('--default_endpoint_name', type=str, default='local', help='Name of localhost provisioning service,'
+ 'that created by default')
parser.add_argument('--action', required=True, type=str, default='', choices=['build', 'deploy', 'create', 'terminate'],
help='Available options: build, deploy, create, terminate')
args = parser.parse_args()
diff --git a/infrastructure-provisioning/src/general/files/os/local_endpoint.json b/infrastructure-provisioning/src/general/files/os/local_endpoint.json
index 5178414..aab5305 100644
--- a/infrastructure-provisioning/src/general/files/os/local_endpoint.json
+++ b/infrastructure-provisioning/src/general/files/os/local_endpoint.json
@@ -1,6 +1,6 @@
{
- "name" : "local",
+ "name" : "DEF_ENDPOINT_NAME",
"url" : "https://localhost:8084/",
- "account" : "local",
- "endpoint_tag" : "local"
+ "account" : "DEF_ENDPOINT_NAME",
+ "endpoint_tag" : "DEF_ENDPOINT_NAME"
}
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 32d657a..f6a3a9a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -71,7 +71,9 @@ if __name__ == "__main__":
edge_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
edge_conf['endpoint_name'])
- edge_conf['shared_bucket_name'] = '{}-shared-bucket'.format(edge_conf['service_base_name'])
+ edge_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ edge_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(edge_conf['service_base_name'],
+ edge_conf['default_endpoint_name'])
edge_conf['instance_size'] = os.environ['gcp_edge_instance_size']
edge_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
edge_conf['static_address_name'] = '{0}-{1}-ip'.format(edge_conf['service_base_name'], edge_conf['project_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index c220f39..733c683 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -77,7 +77,9 @@ if __name__ == "__main__":
project_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
project_conf['project_name'],
project_conf['endpoint_name'])
- project_conf['shared_bucket_name'] = '{}-shared-bucket'.format(project_conf['service_base_name'])
+ project_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ project_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(project_conf['service_base_name'],
+ project_conf['default_endpoint_name'])
project_conf['instance_size'] = os.environ['gcp_edge_instance_size']
project_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
project_conf['image_name'] = os.environ['gcp_{}_image_name'.format(os.environ['conf_os_family'])]
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index ce14268..0a0ef24 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -52,7 +52,9 @@ if __name__ == "__main__":
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
ssn_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(ssn_conf['service_base_name'])
- ssn_conf['shared_bucket_name'] = '{}-shared-bucket'.format(ssn_conf['service_base_name'])
+ ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ ssn_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
+ ssn_conf['default_endpoint_name'])
ssn_conf['instance_name'] = '{}-ssn'.format(ssn_conf['service_base_name'])
ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
ssn_conf['vpc_name'] = '{}-ssn-vpc'.format(ssn_conf['service_base_name'])
@@ -381,11 +383,13 @@ if __name__ == "__main__":
]
params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled {} " \
"--request_id {} --billing_dataset_name {} \
- --resource {} --service_base_name {} --cloud_provider {} --cloud_params '{}'". \
+ --resource {} --service_base_name {} --cloud_provider {} --default_endpoint_name {} " \
+ "--cloud_params '{}'". \
format(instance_hostname, ssn_conf['ssh_key_path'], os.environ['ssn_dlab_path'], ssn_conf['dlab_ssh_user'],
os.environ['conf_os_family'], billing_enabled, os.environ['request_id'],
os.environ['billing_dataset_name'], os.environ['conf_resource'],
- ssn_conf['service_base_name'], os.environ['conf_cloud_provider'], json.dumps(cloud_params))
+ ssn_conf['service_base_name'], os.environ['conf_cloud_provider'], ssn_conf['default_endpoint_name'],
+ json.dumps(cloud_params))
try:
local("~/scripts/{}.py {}".format('configure_ui', params))
except:
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index af9170f..be55481 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -48,7 +48,9 @@ if __name__ == "__main__":
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
ssn_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(ssn_conf['service_base_name'])
- ssn_conf['shared_bucket_name'] = '{}-shared-bucket'.format(ssn_conf['service_base_name'])
+ ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ ssn_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
+ ssn_conf['default_endpoint_name'])
ssn_conf['instance_name'] = '{}-ssn'.format(ssn_conf['service_base_name'])
ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
ssn_conf['vpc_name'] = '{}-ssn-vpc'.format(ssn_conf['service_base_name'])
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 4b703f9..0a2f23c 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -44,6 +44,7 @@ parser.add_argument('--request_id', type=str, default='')
parser.add_argument('--resource', type=str, default='')
parser.add_argument('--service_base_name', type=str, default='')
parser.add_argument('--billing_dataset_name', type=str, default='')
+parser.add_argument('--default_endpoint_name', type=str, default='')
parser.add_argument('--tag_resource_id', type=str, default=None)
parser.add_argument('--billing_tag', type=str, default=None)
parser.add_argument('--account_id', type=str, default=None)
@@ -99,7 +100,7 @@ def copy_ssn_libraries():
sys.exit(1)
-def configure_mongo(mongo_passwd):
+def configure_mongo(mongo_passwd, default_endpoint_name):
try:
if not exists("/lib/systemd/system/mongod.service"):
if os.environ['conf_os_family'] == 'debian':
@@ -126,6 +127,7 @@ def configure_mongo(mongo_passwd):
args.cloud_provider,
env.host_string))
sudo('mv /tmp/mongo_roles.json ' + args.dlab_path + 'tmp/')
+ sudo('sed -i "s|DEF_ENDPOINT_NAME|{0}|g" /tmp/local_endpoint.json'.format(default_endpoint_name))
sudo('mv /tmp/local_endpoint.json ' + args.dlab_path + 'tmp/')
sudo("python " + args.dlab_path + "tmp/configure_mongo.py --dlab_path {} ".format(
args.dlab_path))
@@ -209,7 +211,7 @@ if __name__ == "__main__":
ensure_mongo()
print("Configuring MongoDB")
- configure_mongo(mongo_passwd)
+ configure_mongo(mongo_passwd, args.default_endpoint_name)
sudo('echo DLAB_CONF_DIR={} >> /etc/profile'.format(dlab_conf_dir))
sudo('echo export DLAB_CONF_DIR >> /etc/profile')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org