summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-01-25 15:07:38 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-01-25 15:07:38 -0500
commitf927d44a46bd8c31addaf38f6ac2afd85d7b464a (patch)
tree24363a695ec4a867c47f1e4243812a5101d146d3
parent00e52c75329b3a94313c210e1af165b5fcffa961 (diff)
parent631e5977e2e146f2f4906652856494a5e823a04b (diff)
downloadopenshift-f927d44a46bd8c31addaf38f6ac2afd85d7b464a.tar.gz
openshift-f927d44a46bd8c31addaf38f6ac2afd85d7b464a.tar.bz2
openshift-f927d44a46bd8c31addaf38f6ac2afd85d7b464a.tar.xz
openshift-f927d44a46bd8c31addaf38f6ac2afd85d7b464a.zip
Merge pull request #1236 from detiber/add_nodes
Remove camel case for bin/cluster addNodes
-rwxr-xr-xbin/cluster8
-rw-r--r--playbooks/aws/openshift-cluster/add_nodes.yml (renamed from playbooks/aws/openshift-cluster/addNodes.yml)0
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/cluster b/bin/cluster
index c2765ff92..c3b101c98 100755
--- a/bin/cluster
+++ b/bin/cluster
@@ -68,7 +68,7 @@ class Cluster(object):
self.action(args, inventory, cluster, playbook)
- def addNodes(self, args):
+ def add_nodes(self, args):
"""
Add nodes to an existing cluster for given provider
:param args: command line arguments provided by user
@@ -76,7 +76,7 @@ class Cluster(object):
cluster = {'cluster_id': args.cluster_id,
'deployment_type': self.get_deployment_type(args),
}
- playbook = "playbooks/{0}/openshift-cluster/addNodes.yml".format(args.provider)
+ playbook = "playbooks/{0}/openshift-cluster/add_nodes.yml".format(args.provider)
inventory = self.setup_provider(args.provider)
cluster['num_nodes'] = args.nodes
@@ -321,13 +321,13 @@ if __name__ == '__main__':
create_parser.set_defaults(func=cluster.create)
- create_parser = action_parser.add_parser('addNodes', help='Add nodes to a cluster',
+ create_parser = action_parser.add_parser('add-nodes', help='Add nodes to a cluster',
parents=[meta_parser])
create_parser.add_argument('-n', '--nodes', default=1, type=int,
help='number of nodes to add to the cluster')
create_parser.add_argument('-i', '--infra', default=1, type=int,
help='number of infra nodes to add to the cluster')
- create_parser.set_defaults(func=cluster.addNodes)
+ create_parser.set_defaults(func=cluster.add_nodes)
config_parser = action_parser.add_parser('config',
diff --git a/playbooks/aws/openshift-cluster/addNodes.yml b/playbooks/aws/openshift-cluster/add_nodes.yml
index 3d88e6b23..3d88e6b23 100644
--- a/playbooks/aws/openshift-cluster/addNodes.yml
+++ b/playbooks/aws/openshift-cluster/add_nodes.yml