summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Beaver <michaelbeaver64@gmail.com>2019-03-05 14:22:50 -0600
committerMichael Beaver <michaelbeaver64@gmail.com>2019-03-11 12:42:00 -0500
commitdd062424bbc4e54bb797dec48baa6a1095cfd9f1 (patch)
tree550e64c87ec985859b2d8c0c2e9076f331091064
parentc132915dcc3289342bd272aca774947db1158c41 (diff)
Normalize assignment of Tiller defaults
The Tiller handler class already handles the default assignment of Tiller host, port, and namespace. This change removes other locations that are creating additional default values to avoid confusion. Change-Id: If03150075281dd8b6362e817af075d5cd321aa77
Notes
Notes (review): Code-Review+2: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+2: Sean Eagan <sean.eagan@att.com> Code-Review+1: Dustin Specker <dustin.specker@att.com> Code-Review+1: Vladyslav Drok <vdrok@mirantis.com> Code-Review+2: Evgeniy L <eli@mirantis.com> Workflow+1: Evgeniy L <eli@mirantis.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Mar 2019 19:37:25 +0000 Reviewed-on: https://review.openstack.org/641126 Project: openstack/airship-armada Branch: refs/heads/master
-rw-r--r--armada/cli/apply.py7
-rw-r--r--armada/cli/delete.py4
-rw-r--r--armada/cli/rollback.py7
-rw-r--r--armada/cli/test.py7
-rw-r--r--armada/cli/tiller.py7
5 files changed, 10 insertions, 22 deletions
diff --git a/armada/cli/apply.py b/armada/cli/apply.py
index 62f8d70..ee56f29 100644
--- a/armada/cli/apply.py
+++ b/armada/cli/apply.py
@@ -95,16 +95,13 @@ SHORT_DESC = "Command installs manifest charts."
95 default=[]) 95 default=[])
96@click.option('--tiller-host', help="Tiller host IP.", default=None) 96@click.option('--tiller-host', help="Tiller host IP.", default=None)
97@click.option( 97@click.option(
98 '--tiller-port', 98 '--tiller-port', help="Tiller host port.", type=int, default=None)
99 help="Tiller host port.",
100 type=int,
101 default=CONF.tiller_port)
102@click.option( 99@click.option(
103 '--tiller-namespace', 100 '--tiller-namespace',
104 '-tn', 101 '-tn',
105 help="Tiller namespace.", 102 help="Tiller namespace.",
106 type=str, 103 type=str,
107 default=CONF.tiller_namespace) 104 default=None)
108@click.option( 105@click.option(
109 '--timeout', 106 '--timeout',
110 help="Specifies time to wait for each chart to fully " 107 help="Specifies time to wait for each chart to fully "
diff --git a/armada/cli/delete.py b/armada/cli/delete.py
index 292dba0..f36cfdf 100644
--- a/armada/cli/delete.py
+++ b/armada/cli/delete.py
@@ -63,9 +63,9 @@ SHORT_DESC = "Command deletes releases."
63 '--releases', help="Comma-separated list of release names.", type=str) 63 '--releases', help="Comma-separated list of release names.", type=str)
64@click.option( 64@click.option(
65 '--no-purge', help="Deletes release without purge option.", is_flag=True) 65 '--no-purge', help="Deletes release without purge option.", is_flag=True)
66@click.option('--tiller-host', help="Tiller host IP.") 66@click.option('--tiller-host', help="Tiller host IP.", default=None)
67@click.option( 67@click.option(
68 '--tiller-port', help="Tiller host port.", type=int, default=44134) 68 '--tiller-port', help="Tiller host port.", type=int, default=None)
69@click.option('--bearer-token', help="User Bearer token.", default=None) 69@click.option('--bearer-token', help="User Bearer token.", default=None)
70@click.option('--debug', help="Enable debug logging.", is_flag=True) 70@click.option('--debug', help="Enable debug logging.", is_flag=True)
71@click.pass_context 71@click.pass_context
diff --git a/armada/cli/rollback.py b/armada/cli/rollback.py
index 8923544..f701686 100644
--- a/armada/cli/rollback.py
+++ b/armada/cli/rollback.py
@@ -52,16 +52,13 @@ SHORT_DESC = "Command performs a release rollback."
52@click.option('--dry-run', help="Perform a dry-run rollback.", is_flag=True) 52@click.option('--dry-run', help="Perform a dry-run rollback.", is_flag=True)
53@click.option('--tiller-host', help="Tiller host IP.", default=None) 53@click.option('--tiller-host', help="Tiller host IP.", default=None)
54@click.option( 54@click.option(
55 '--tiller-port', 55 '--tiller-port', help="Tiller host port.", type=int, default=None)
56 help="Tiller host port.",
57 type=int,
58 default=CONF.tiller_port)
59@click.option( 56@click.option(
60 '--tiller-namespace', 57 '--tiller-namespace',
61 '-tn', 58 '-tn',
62 help="Tiller namespace.", 59 help="Tiller namespace.",
63 type=str, 60 type=str,
64 default=CONF.tiller_namespace) 61 default=None)
65@click.option( 62@click.option(
66 '--timeout', 63 '--timeout',
67 help="Specifies time to wait for rollback to complete.", 64 help="Specifies time to wait for rollback to complete.",
diff --git a/armada/cli/test.py b/armada/cli/test.py
index 14efb83..315374a 100644
--- a/armada/cli/test.py
+++ b/armada/cli/test.py
@@ -59,16 +59,13 @@ SHORT_DESC = "Command tests releases."
59@click.option('--release', help="Helm release.", type=str) 59@click.option('--release', help="Helm release.", type=str)
60@click.option('--tiller-host', help="Tiller host IP.", default=None) 60@click.option('--tiller-host', help="Tiller host IP.", default=None)
61@click.option( 61@click.option(
62 '--tiller-port', 62 '--tiller-port', help="Tiller host port.", type=int, default=None)
63 help="Tiller host port.",
64 type=int,
65 default=CONF.tiller_port)
66@click.option( 63@click.option(
67 '--tiller-namespace', 64 '--tiller-namespace',
68 '-tn', 65 '-tn',
69 help="Tiller Namespace.", 66 help="Tiller Namespace.",
70 type=str, 67 type=str,
71 default=CONF.tiller_namespace) 68 default=None)
72@click.option( 69@click.option(
73 '--target-manifest', 70 '--target-manifest',
74 help=("The target manifest to run. Required for specifying " 71 help=("The target manifest to run. Required for specifying "
diff --git a/armada/cli/tiller.py b/armada/cli/tiller.py
index 22a3b15..d84f2a0 100644
--- a/armada/cli/tiller.py
+++ b/armada/cli/tiller.py
@@ -49,16 +49,13 @@ SHORT_DESC = "Command gets Tiller information."
49@tiller.command(name='tiller', help=DESC, short_help=SHORT_DESC) 49@tiller.command(name='tiller', help=DESC, short_help=SHORT_DESC)
50@click.option('--tiller-host', help="Tiller host IP.", default=None) 50@click.option('--tiller-host', help="Tiller host IP.", default=None)
51@click.option( 51@click.option(
52 '--tiller-port', 52 '--tiller-port', help="Tiller host port.", type=int, default=None)
53 help="Tiller host port.",
54 type=int,
55 default=CONF.tiller_port)
56@click.option( 53@click.option(
57 '--tiller-namespace', 54 '--tiller-namespace',
58 '-tn', 55 '-tn',
59 help="Tiller namespace.", 56 help="Tiller namespace.",
60 type=str, 57 type=str,
61 default=CONF.tiller_namespace) 58 default=None)
62@click.option('--releases', help="List of deployed releases.", is_flag=True) 59@click.option('--releases', help="List of deployed releases.", is_flag=True)
63@click.option('--status', help="Status of Tiller services.", is_flag=True) 60@click.option('--status', help="Status of Tiller services.", is_flag=True)
64@click.option('--bearer-token', help="User bearer token.", default=None) 61@click.option('--bearer-token', help="User bearer token.", default=None)