From 4712e72c912a1102bff0508c98bd97da3f33ae95 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 23 Mar 2015 23:53:17 -0400
Subject: openshift_facts role/module refactor default settings
- Add openshift_facts role and module
- Created new role openshift_facts that contains an openshift_facts module
- Refactor openshift_* roles to use openshift_facts instead of relying on
defaults
- Refactor playbooks to use openshift_facts
- Cleanup inventory group_vars
- Update defaults
- update openshift_master role firewall defaults
- remove etcd peer port, since we will not be supporting clustered embedded
etcd
- remove 8444 since console now runs on the api port by default
- add 8444 and 7001 to disabled services to ensure removal if updating
- Add new role os_env_extras_node that is a subset of the docker role
- previously, we were starting/enabling docker which was causing issues with some
installations
- Does not install or start docker, since the openshift-node role will
handle that for us
- Only adds root to the dockerroot group
- Update playbooks to use ops_env_extras_node role instead of docker role
- os_firewall bug fixes
- ignore ip6tables for now, since we are not configuring any ipv6 rules
- if installing package do a daemon-reload before starting/enabling service
- Add aws support to bin/cluster
- Add list action to bin/cluster
- Add update action to bin/cluster
- cleanup some stray debug statements
- some variable renaming for clarity
---
bin/cluster | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
(limited to 'bin')
diff --git a/bin/cluster b/bin/cluster
index b99286b46..36ab1da1b 100755
--- a/bin/cluster
+++ b/bin/cluster
@@ -32,8 +32,8 @@ class Cluster(object):
playbook = "playbooks/{}/openshift-cluster/launch.yml".format(args.provider)
inventory = self.setup_provider(args.provider)
- env['masters'] = args.masters
- env['nodes'] = args.nodes
+ env['num_masters'] = args.masters
+ env['num_nodes'] = args.nodes
return self.action(args, inventory, env, playbook)
@@ -55,16 +55,23 @@ class Cluster(object):
:param args: command line arguments provided by user
:return: exit status from run command
"""
- raise NotImplementedError("ACTION [{}] not implemented".format(sys._getframe().f_code.co_name))
+ env = {'cluster_id': args.cluster_id}
+ playbook = "playbooks/{}/openshift-cluster/list.yml".format(args.provider)
+ inventory = self.setup_provider(args.provider)
+
+ return self.action(args, inventory, env, playbook)
def update(self, args):
"""
- Update OpenShift across clustered VMs
+ Update to latest OpenShift across clustered VMs
:param args: command line arguments provided by user
:return: exit status from run command
"""
- raise NotImplementedError("ACTION [{}] not implemented".format(sys._getframe().f_code.co_name))
+ env = {'cluster_id': args.cluster_id}
+ playbook = "playbooks/{}/openshift-cluster/update.yml".format(args.provider)
+ inventory = self.setup_provider(args.provider)
+ return self.action(args, inventory, env, playbook)
def setup_provider(self, provider):
"""
--
cgit v1.2.3