summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishant kumar <nk613n@att.com>2019-01-25 16:18:20 +0000
committerMichael Beaver <michaelbeaver64@gmail.com>2019-03-11 12:39:39 -0500
commitc132915dcc3289342bd272aca774947db1158c41 (patch)
treefb79f6ff6934913a751948394213accb90f5aaed
parent20e270a58b55c4a2d167349ba88d397b25d7b995 (diff)
Enable Armada to acquire Tiller IP from config file
This adds a new configuration default to specify the Tiller host IP. This is important to be able to configure in environments where Armada is unable to find a Tiller pod. Change-Id: I12fd9fbd16f2b591620e566affcf19f859ed1855
Notes
Notes (review): Code-Review+2: Sean Eagan <sean.eagan@att.com> Code-Review+2: Drew Walters <drewwalters96@gmail.com> Workflow+1: Drew Walters <drewwalters96@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 11 Mar 2019 19:29:38 +0000 Reviewed-on: https://review.openstack.org/633237 Project: openstack/airship-armada Branch: refs/heads/master
-rw-r--r--armada/conf/default.py4
-rw-r--r--armada/handlers/tiller.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/armada/conf/default.py b/armada/conf/default.py
index 6418bb3..ca4967e 100644
--- a/armada/conf/default.py
+++ b/armada/conf/default.py
@@ -69,6 +69,10 @@ path to the private key that includes the name of the key itself.""")),
69 'tiller_namespace', 69 'tiller_namespace',
70 default='kube-system', 70 default='kube-system',
71 help=utils.fmt('Namespace for the Tiller pod.')), 71 help=utils.fmt('Namespace for the Tiller pod.')),
72 cfg.StrOpt(
73 'tiller_host',
74 default=None,
75 help=utils.fmt('IP/hostname of the Tiller pod.')),
72 cfg.IntOpt( 76 cfg.IntOpt(
73 'tiller_port', 77 'tiller_port',
74 default=44134, 78 default=44134,
diff --git a/armada/handlers/tiller.py b/armada/handlers/tiller.py
index aaa16b9..ef40fcd 100644
--- a/armada/handlers/tiller.py
+++ b/armada/handlers/tiller.py
@@ -82,7 +82,7 @@ class Tiller(object):
82 tiller_namespace=None, 82 tiller_namespace=None,
83 bearer_token=None, 83 bearer_token=None,
84 dry_run=None): 84 dry_run=None):
85 self.tiller_host = tiller_host 85 self.tiller_host = tiller_host or CONF.tiller_host
86 self.tiller_port = tiller_port or CONF.tiller_port 86 self.tiller_port = tiller_port or CONF.tiller_port
87 self.tiller_namespace = tiller_namespace or CONF.tiller_namespace 87 self.tiller_namespace = tiller_namespace or CONF.tiller_namespace
88 self.bearer_token = bearer_token 88 self.bearer_token = bearer_token