summaryrefslogtreecommitdiffstats
path: root/bin/cluster
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-07-23 11:33:55 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-07-23 11:33:55 -0400
commit97f96b71ff8abc2ccf38e745e124c68b91a71146 (patch)
tree5277b77d4652b3c502f7f5f9da4033ae89edd24f /bin/cluster
parent65aa983ce83cafc45d28a1a283525f1fa45a9895 (diff)
parentc4cca1d7184ae859706b5854a04f18095c12f1d6 (diff)
downloadopenshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.gz
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.bz2
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.xz
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.zip
Merge pull request #376 from wshearn/infra_node_support
Infra node support
Diffstat (limited to 'bin/cluster')
-rwxr-xr-xbin/cluster5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/cluster b/bin/cluster
index 746c0349a..7eb4a4448 100755
--- a/bin/cluster
+++ b/bin/cluster
@@ -51,6 +51,7 @@ class Cluster(object):
env['num_masters'] = args.masters
env['num_nodes'] = args.nodes
+ env['num_infra'] = args.infra
env['num_etcd'] = args.etcd
return self.action(args, inventory, env, playbook)
@@ -149,7 +150,7 @@ class Cluster(object):
boto_conf_files = ['~/.aws/credentials', '~/.boto']
conf_exists = lambda conf: os.path.isfile(os.path.expanduser(conf))
- boto_configs = [ conf for conf in boto_conf_files if conf_exists(conf)]
+ boto_configs = [conf for conf in boto_conf_files if conf_exists(conf)]
if len(key_missing) > 0 and len(boto_configs) == 0:
raise ValueError("PROVIDER aws requires {} environment variable(s). See README_AWS.md".format(missing))
@@ -262,6 +263,8 @@ if __name__ == '__main__':
help='number of masters to create in cluster')
create_parser.add_argument('-n', '--nodes', default=2, type=int,
help='number of nodes to create in cluster')
+ create_parser.add_argument('-i', '--infra', default=1, type=int,
+ help='number of infra nodes to create in cluster')
create_parser.add_argument('-e', '--etcd', default=0, type=int,
help='number of external etcd hosts to create in cluster')
create_parser.set_defaults(func=cluster.create)