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/04 11:32:58 UTC
[incubator-dlab] branch DLAB-1174-hotfix created (now 7b5c2ca)
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a change to branch DLAB-1174-hotfix
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 7b5c2ca Hotfix for edge stop/start after adding endpoint name.
This branch includes the following new commits:
new 7b5c2ca Hotfix for edge stop/start after adding endpoint name.
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Hotfix for edge stop/start after adding
endpoint name.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1174-hotfix
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7b5c2ca7aeb401862a03fd0937a933c619609b1d
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 4 14:32:40 2019 +0300
Hotfix for edge stop/start after adding endpoint name.
---
infrastructure-provisioning/src/general/scripts/aws/edge_start.py | 5 ++++-
infrastructure-provisioning/src/general/scripts/aws/edge_stop.py | 5 ++++-
infrastructure-provisioning/src/general/scripts/azure/edge_start.py | 4 +++-
infrastructure-provisioning/src/general/scripts/azure/edge_stop.py | 4 +++-
infrastructure-provisioning/src/general/scripts/gcp/edge_start.py | 4 +++-
infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py | 4 +++-
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
index cdfdcee..2449cd7 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
@@ -40,7 +40,10 @@ if __name__ == "__main__":
edge_conf = dict()
edge_conf['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
- edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge'
+ edge_conf['project_name'] = os.environ['project_name']
+ edge_conf['endpoint_name'] = os.environ['endpoint_name']
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag'
logging.info('[START EDGE]')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py b/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py
index fae994e..3f99b36 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py
@@ -40,7 +40,10 @@ if __name__ == "__main__":
edge_conf = dict()
edge_conf['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
- edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge'
+ edge_conf['project_name'] = os.environ['project_name']
+ edge_conf['endpoint_name'] = os.environ['endpoint_name']
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag'
logging.info('[STOP EDGE]')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_start.py b/infrastructure-provisioning/src/general/scripts/azure/edge_start.py
index 72cbbf6..445f48d 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_start.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_start.py
@@ -39,7 +39,9 @@ if __name__ == "__main__":
edge_conf['service_base_name'] = os.environ['conf_service_base_name']
edge_conf['resource_group_name'] = os.environ['azure_resource_group_name']
edge_conf['project_name'] = os.environ['project_name'].lower().replace('_', '-')
- edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + edge_conf['project_name'] + '-edge'
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].lower().replace('_', '-')
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['instance_dns_name'] = 'host-' + edge_conf['instance_name'] + '.' + os.environ['azure_region'] + '.cloudapp.azure.com'
logging.info('[START EDGE]')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_stop.py b/infrastructure-provisioning/src/general/scripts/azure/edge_stop.py
index b6af271..1bb319b 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_stop.py
@@ -39,7 +39,9 @@ if __name__ == "__main__":
edge_conf['service_base_name'] = os.environ['conf_service_base_name']
edge_conf['resource_group_name'] = os.environ['azure_resource_group_name']
edge_conf['project_name'] = os.environ['project_name'].lower().replace('_', '-')
- edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + edge_conf['project_name'] + '-edge'
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].lower().replace('_', '-')
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
logging.info('[STOP EDGE]')
print('[STOP EDGE]')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
index a40dc42..06085dd 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
@@ -39,7 +39,9 @@ if __name__ == "__main__":
edge_conf = dict()
edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-')
edge_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-')
- edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name'])
+ edge_conf['endpoint_name'] = (os.environ['endpoint_name']).lower().replace('_', '-')
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['region'] = os.environ['gcp_region']
edge_conf['zone'] = os.environ['gcp_zone']
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/edge_stop.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
index 36ae2d0..5342d8a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
@@ -39,7 +39,9 @@ if __name__ == "__main__":
edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-')
edge_conf['zone'] = os.environ['gcp_zone']
edge_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-')
- edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name'])
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].lower().replace('_', '-')
+ edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'], edge_conf['endpoint_name'])
logging.info('[STOP EDGE]')
print('[STOP EDGE]')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org