You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/24 15:04:46 UTC

[incubator-dlab] branch DLAB-terraform updated: removed unimportant parameters;

This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-terraform by this push:
     new ae25ab5  removed unimportant parameters;
ae25ab5 is described below

commit ae25ab52edb0989522299788051c0892124f6e20
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 24 18:04:38 2019 +0300

    removed unimportant parameters;
---
 infrastructure-provisioning/terraform/bin/dlab.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/infrastructure-provisioning/terraform/bin/dlab.py b/infrastructure-provisioning/terraform/bin/dlab.py
index 2322f19..f985022 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -554,14 +554,14 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
                   default=["0.0.0.0/0"], action='append', group='k8s')
          .add_str('--ami', 'ID of EC2 AMI.', required=True, group='k8s')
          .add_str('--env_os', 'OS type.', default='debian',
-                  choices=['debian', 'redhat'], group=('k8s', 'helm_charts'))
+                  choices=['debian', 'redhat'], group=('k8s'))
          .add_str('--key_name', 'Name of EC2 Key pair.', required=True,
                   group='k8s')
          .add_str('--os_user', 'Name of DLab service user.',
                   default='dlab-user', group='k8s')
          .add_str('--pkey', 'path to key', required=True, group='service')
          .add_str('--region', 'Name of AWS region.', default='us-west-2',
-                  group=('k8s', 'helm_charts'))
+                  group=('k8s'))
          .add_str('--secret_access_key', 'AWS Secret Access Key',
                   required=True,
                   group='k8s')
@@ -575,7 +575,7 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
          .add_int('--ssn_k8s_workers_count', 'Count of K8S workers', default=2,
                   group=('k8s', 'helm_charts'))
          .add_str('--ssn_k8s_masters_shape', 'Shape for SSN K8S masters.',
-                  default='t2.medium', group=('k8s', 'helm_charts'))
+                  default='t2.medium', group=('k8s'))
          .add_str('--ssn_k8s_workers_shape', 'Shape for SSN K8S workers.',
                   default='t2.medium', group='k8s')
          .add_int('--ssn_root_volume_size', 'Size of root volume in GB.',
@@ -603,7 +603,7 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
          .add_str('--vpc_id', 'ID of AWS VPC if you already have VPC created.',
                   group='k8s')
          .add_str('--zone', 'Name of AWS zone', default='a',
-                  group=('k8s', 'helm_charts'))
+                  group=('k8s'))
          .add_str('--ssn_keystore_password', 'ssn_keystore_password',
                   group='helm_charts')
          .add_str('--endpoint_keystore_password', 'endpoint_keystore_password',
@@ -622,9 +622,6 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
                   group='helm_charts')
          .add_str('--ldap_users_group', 'ldap users group', required=True,
                   group='helm_charts')
-         .add_str('--ssn_subnet', 'ssn subnet id', group='helm_charts')
-         .add_str('--ssn_k8s_sg_id', 'ssn sg ids', group='helm_charts')
-         .add_str('--ssn_vpc_id', 'ssn vpc id', group='helm_charts')
          .add_str('--tag_resource_id', 'Tag resource ID.',
                   default='user:tag', group=('k8s', 'helm_charts'))
          .add_str('--additional_tag', 'Additional tag.',


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org