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/07/19 12:15:46 UTC
[incubator-dlab] branch DLAB-terraform updated: revert endpoint
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 6fab75d revert endpoint
new 8cce15f Merge pull request #173 from bohdana-kuzmenko/DLAB-terraform-cli
6fab75d is described below
commit 6fab75d0ce7f363859dd48037abccc67bc91a7c8
Author: bohdana_kuzmenko <bo...@gmail.com>
AuthorDate: Fri Jul 19 11:36:33 2019 +0300
revert endpoint
---
.../terraform/bin/terraform-cli.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/terraform-cli.py b/infrastructure-provisioning/terraform/bin/terraform-cli.py
index 48f9ed4..e6890aa 100755
--- a/infrastructure-provisioning/terraform/bin/terraform-cli.py
+++ b/infrastructure-provisioning/terraform/bin/terraform-cli.py
@@ -451,9 +451,9 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
conn.run('terraform validate')
conn.run('terraform apply -auto-approve '
'-var \'ssn_k8s_alb_dns_name={}\''.format(dns_name))
- # output = ' '.join(conn.run('terraform output -json')
- # .stdout.split())
- # self.fill_args_from_dict(json.loads(output))
+ output = ' '.join(conn.run('terraform output -json')
+ .stdout.split())
+ self.fill_args_from_dict(json.loads(output))
def output_terraform_result(self):
dns_name = json.loads(TerraformProvider().output(' -json ssn_k8s_alb_dns_name'))
@@ -487,8 +487,8 @@ class AWSK8sSourceBuilder(AbstractDeployBuilder):
self.check_tiller_status()
self.copy_terraform_to_remote()
self.run_remote_terraform()
- # output = ' '.join(json.loads(TerraformProvider().output('- json')).split())
- # self.fill_args_from_dict(output)
+ output = ' '.join(json.loads(TerraformProvider().output('- json')).split())
+ self.fill_args_from_dict(output)
self.output_terraform_result()
@@ -534,7 +534,7 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
def main():
- sources_targets = {'aws': ['k8s']}
+ sources_targets = {'aws': ['k8s', 'endpoint']}
no_args_error = ('usage: ./terraform-cli {} {}'
.format(set(sources_targets.keys()),
@@ -562,8 +562,8 @@ def main():
if source == 'aws':
if target == 'k8s':
builders = AWSK8sSourceBuilder(),
- # elif target == 'endpoint':
- # builders = (AWSK8sSourceBuilder(), AWSEndpointBuilder())
+ elif target == 'endpoint':
+ builders = (AWSK8sSourceBuilder(), AWSEndpointBuilder())
deploy_director = DeployDirector()
deploy_director.build(*builders)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org