This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch DLAB-3 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d0c98063cdd48f6f1bdd73470e389759ea929804 Author: Oleksandr_Isniuk <i.oleksa...@gmail.com> AuthorDate: Fri May 10 16:51:57 2019 +0300 change ssn primary drive size first configuration of guacamole --- .../src/general/lib/aws/actions_lib.py | 8 ++++++++ .../src/general/scripts/aws/ssn_prepare.py | 4 ++-- .../src/ssn/scripts/configure_ssn_node.py | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py index 9fe4482..d8e00f3 100644 --- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py @@ -436,6 +436,14 @@ def create_instance(definitions, instance_tag, primary_disk_size=12): elif definitions.instance_class == 'ssn': get_iam_profile(definitions.iam_profile) instances = ec2.create_instances(ImageId=definitions.ami_id, MinCount=1, MaxCount=1, + BlockDeviceMappings=[ + { + "DeviceName": "/dev/sda1", + "Ebs": + { + "VolumeSize": int(primary_disk_size) + } + }], KeyName=definitions.key_name, SecurityGroupIds=security_groups_ids, InstanceType=definitions.instance_type, diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py index e864f82..8207708 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py @@ -426,10 +426,10 @@ if __name__ == "__main__": logging.info('[CREATE SSN INSTANCE]') print('[CREATE SSN INSTANCE]') params = "--node_name {0} --ami_id {1} --instance_type {2} --key_name {3} --security_group_ids {4} --subnet_id {5} " \ - "--iam_profile {6} --infra_tag_name {7} --infra_tag_value {8} --instance_class {9}".\ + "--iam_profile {6} --infra_tag_name {7} --infra_tag_value {8} --instance_class {9} --primary_disk_size {10}".\ format(instance_name, ssn_ami_id, os.environ['aws_ssn_instance_size'], os.environ['conf_key_name'], os.environ['aws_security_groups_ids'], os.environ['aws_subnet_id'], - role_profile_name, tag_name, instance_name, 'ssn') + role_profile_name, tag_name, instance_name, 'ssn', '20') try: local("~/scripts/{}.py {}".format('common_create_instance', params)) diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py index 6f55ab7..ce10c62 100644 --- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py +++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py @@ -146,6 +146,22 @@ def docker_build_script(): print('Failed to configure docker_build script: ', str(err)) sys.exit(1) +def configure_guacamole(): + try: + mysql_pass = id_generator() + sudo('docker run --name guacd -d -p 4822:4822 guacamole/guacd') + sudo('docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql') + sudo('mkdir /tmp/scripts') + sudo('cp initdb.sql /tmp/scripts') + sudo('mkdir /opt/mysql') + sudo('docker run --name guac-mysql -v /tmp/scripts:/tmp/scripts -v /opt/mysql:/var/lib/mysql -e MYSQL_ROOT_PASSWORD={} -d mysql:latest'.format(mysql_pass)) + sudo('touch /opt/mysql/dock-query.sql') + sudo("""echo "CREATE DATABASE guacamole; CREATE USER 'guacamole' IDENTIFIED BY '{}'; GRANT SELECT,INSERT,UPDATE,DELETE ON guacamolala7.* TO 'guacamolala7';" > /opt/mysql/dock-query.sql""") + sudo('docker exec -it guac-mysql /bin/bash -c "mysql -u root -p{} < /var/lib/mysql/query.mysql"'.format(mysql_pass)) + sudo('docker exec -it guac-mysql /bin/bash -c "cat /tmp/scripts/initdb.sql | mysql -u root -p{} guacamole"'.format(mysql_pass)) + sudo("docker run --name guacamole --link guacd:guacd --link guac-mysql:mysql -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='guacamole' -d -p 8080:8080 guacamole/guacamole") + + ############## # Run script # ############## --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org