You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/07/19 10:29:48 UTC
[incubator-dlab] branch develop updated: IAM Role project tag added
Spark cluster and EMR cluster project tag added Docker of resource status
fixed
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 6617494 IAM Role project tag added Spark cluster and EMR cluster project tag added Docker of resource status fixed
new 6e8f86c Merge pull request #174 from bodnarmykola/DLAB-748
6617494 is described below
commit 66174944793a4aed8a5a01fb62e6be5470be7be5
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Thu Jul 18 17:27:01 2019 +0300
IAM Role project tag added
Spark cluster and EMR cluster project tag added
Docker of resource status fixed
---
infrastructure-provisioning/src/edge/fabfile.py | 2 +-
infrastructure-provisioning/src/general/api/status.py | 4 ++--
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 6 ++++++
.../src/general/scripts/aws/dataengine-service_create.py | 6 ++++++
.../src/general/scripts/aws/dataengine_prepare.py | 7 +++++++
infrastructure-provisioning/src/general/scripts/aws/edge_status.py | 2 +-
6 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/edge/fabfile.py b/infrastructure-provisioning/src/edge/fabfile.py
index 009f4e4..edbed71 100644
--- a/infrastructure-provisioning/src/edge/fabfile.py
+++ b/infrastructure-provisioning/src/edge/fabfile.py
@@ -31,7 +31,7 @@ import traceback
def status():
- local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id'])
+ local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id'])
local_log_filepath = "/logs/edge/" + local_log_filename
logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s',
level=logging.DEBUG,
diff --git a/infrastructure-provisioning/src/general/api/status.py b/infrastructure-provisioning/src/general/api/status.py
index e289c9c..0b007b9 100644
--- a/infrastructure-provisioning/src/general/api/status.py
+++ b/infrastructure-provisioning/src/general/api/status.py
@@ -49,10 +49,10 @@ if __name__ == "__main__":
except:
reply['response']['result'] = {"error": "Failed to open result.json"}
reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'],
- os.environ['project_name'],
+ os.environ['edge_user_name'],
os.environ['request_id'])
- with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'],
+ with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'],
os.environ['request_id']), 'w') as response_file:
response_file.write(json.dumps(reply))
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 99767b5..8caeff9 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -543,6 +543,12 @@ def create_iam_role(role_name, role_profile, region, service='ec2', tag=None):
if 'conf_billing_tag_key' in os.environ and 'conf_billing_tag_value' in os.environ:
conn.tag_role(RoleName=role_name, Tags=[{'Key': os.environ['conf_billing_tag_key'],
'Value': os.environ['conf_billing_tag_value']}])
+ if os.environ['project_tag']:
+ conn.tag_role(RoleName=role_name, Tags=[{'Key': "project_tag",
+ 'Value': os.environ['project_tag']}])
+ if os.environ['project_name']:
+ conn.tag_role(RoleName=role_name, Tags=[{'Key': "project_name",
+ 'Value': os.environ['project_name']}])
except botocore.exceptions.ClientError as e_role:
if e_role.response['Error']['Code'] == 'EntityAlreadyExists':
print("IAM role already exists. Reusing...")
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
index 995d9a2..b11286c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
@@ -73,6 +73,12 @@ parser.add_argument('--service_base_name', type=str, default='')
parser.add_argument('--additional_emr_sg', type=str, default='')
args = parser.parse_args()
+try:
+ os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_name:{}'.format(os.environ['project_name'])
+except KeyError:
+ os.environ['conf_additional_tags'] = 'project_name:{}'.format(os.environ['project_name'])
+print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags']))
+
if args.region == 'us-east-1':
endpoint_url = 'https://s3.amazonaws.com'
elif args.region == 'cn-north-1':
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
index 2a8198d..40c5648 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
@@ -122,6 +122,13 @@ if __name__ == "__main__":
json.dump(data, f)
try:
+ os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_name:{}'.format(
+ os.environ['project_name'])
+ except KeyError:
+ os.environ['conf_additional_tags'] = 'project_name:{}'.format(os.environ['project_name'])
+ print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags']))
+
+ try:
logging.info('[CREATE MASTER NODE]')
print('[CREATE MASTER NODE]')
data_engine['cluster_nodes_tag_type'] = {"Key": "Type", "Value": "master"}
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
index e302bdc..86ff6e3 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
@@ -30,7 +30,7 @@ from dlab.actions_lib import *
if __name__ == "__main__":
- local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id'])
+ local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id'])
local_log_filepath = "/logs/edge/" + local_log_filename
logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s',
level=logging.DEBUG,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org