summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-02 11:17:17 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-02 11:17:17 -0500
commit65c480f53156f2c5ce2de4cc8919f7693dfaf03c (patch)
treed1d137773c16fab10dacc87d9958d253c0bbdb0b
parent5551a701e467f1fe205dc170c4b0fc651a285c5a (diff)
parent8c88ecb54199b05549ec1d6c68938337cbb4a6c1 (diff)
downloadopenshift-65c480f53156f2c5ce2de4cc8919f7693dfaf03c.tar.gz
openshift-65c480f53156f2c5ce2de4cc8919f7693dfaf03c.tar.bz2
openshift-65c480f53156f2c5ce2de4cc8919f7693dfaf03c.tar.xz
openshift-65c480f53156f2c5ce2de4cc8919f7693dfaf03c.zip
Merge pull request #89 from detiber/registerNode
openshift_node changes for register_node module
-rw-r--r--roles/openshift_node/library/openshift_register_node.py150
-rw-r--r--roles/openshift_node/tasks/main.yml6
2 files changed, 156 insertions, 0 deletions
diff --git a/roles/openshift_node/library/openshift_register_node.py b/roles/openshift_node/library/openshift_register_node.py
new file mode 100644
index 000000000..87290c209
--- /dev/null
+++ b/roles/openshift_node/library/openshift_register_node.py
@@ -0,0 +1,150 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import os
+import multiprocessing
+import socket
+from subprocess import check_output, Popen
+
+DOCUMENTATION = '''
+---
+module: openshift_register_node
+short_description: This module registers an openshift-node with an openshift-master
+author: Jason DeTiberus
+requirements: [ openshift-node ]
+notes: Node resources can be specified using either the resources option or the following options: cpu, memory
+options:
+ name:
+ description:
+ - id for this node (usually the node fqdn)
+ required: true
+ hostIP:
+ description:
+ - ip address for this node
+ required: false
+ cpu:
+ description:
+ - number of CPUs for this node
+ required: false
+ default: number of logical CPUs detected
+ memory:
+ description:
+ - Memory available for this node in bytes
+ required: false
+ default: 80% MemTotal
+ resources:
+ description:
+ - A json string representing Node resources
+ required: false
+'''
+EXAMPLES = '''
+# Minimal node registration
+- openshift_register_node: name=ose3.node.example.com
+
+# Node registration with all options (using cpu and memory options)
+- openshift_register_node:
+ name: ose3.node.example.com
+ hostIP: 192.168.1.1
+ apiVersion: v1beta1
+ cpu: 1
+ memory: 1073741824
+
+# Node registration with all options (using resources option)
+- openshift_register_node:
+ name: ose3.node.example.com
+ hostIP: 192.168.1.1
+ apiVersion: v1beta1
+ resources:
+ capacity:
+ cpu: 1
+ memory: 1073741824
+'''
+
+def main():
+ default_config='/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig'
+
+ module = AnsibleModule(
+ argument_spec = dict(
+ name = dict(required = True),
+ hostIP = dict(),
+ apiVersion = dict(),
+ cpu = dict(),
+ memory = dict(),
+ resources = dict(),
+ client_config = dict(default = default_config)
+ ),
+ supports_check_mode=True
+ )
+
+ if module.params['resources'] and (module.params['cpu'] or module.params['memory']):
+ module.fail_json(msg="Error: argument resources cannot be specified with the following arguments: cpu, memory")
+
+ client_env = os.environ.copy()
+ client_env['KUBECONFIG'] = module.params['client_config']
+
+ node_def = dict(
+ metadata = dict(
+ name = module.params['name']
+ ),
+ kind = 'Node',
+ resources = dict(
+ capacity = dict()
+ )
+ )
+
+ for key, value in module.params.iteritems():
+ if key in ['cpu', 'memory']:
+ node_def['resources']['capacity'][key] = value
+ elif key == 'name':
+ node_def['id'] = value
+ elif key != 'client_config':
+ if value:
+ node_def[key] = value
+
+ if not node_def['resources']['capacity']['cpu']:
+ node_def['resources']['capacity']['cpu'] = multiprocessing.cpu_count()
+
+ if not node_def['resources']['capacity']['memory']:
+ with open('/proc/meminfo', 'r') as mem:
+ for line in mem:
+ entries = line.split()
+ if str(entries.pop(0)) == 'MemTotal:':
+ mem_free_kb = int(entries.pop(0))
+ mem_capacity = int(mem_free_kb * 1024 * .80)
+ node_def['resources']['capacity']['memory'] = mem_capacity
+ break
+
+ try:
+ output = check_output("osc get nodes", shell=True, env=client_env,
+ stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as e:
+ module.fail_json(msg="Failed to get node list", command=e.cmd,
+ returncode=e.returncode, output=e.output)
+
+ if module.check_mode:
+ if re.search(module.params['name'], output, re.MULTILINE):
+ module.exit_json(changed=False, node_def=node_def)
+ else:
+ module.exit_json(changed=True, node_def=node_def)
+
+ p = Popen("osc create node -f -", shell=True, stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True,
+ env=client_env)
+ (out, err) = p.communicate(module.jsonify(node_def))
+ ret = p.returncode
+
+ if ret != 0:
+ if re.search("minion \"%s\" already exists" % module.params['name'],
+ err):
+ module.exit_json(changed=False,
+ msg="node definition already exists", node_def=node_def)
+ else:
+ module.fail_json(msg="Node creation failed.", ret=ret, out=out,
+ err=err, node_def=node_def)
+
+ module.exit_json(changed=True, out=out, err=err, ret=ret,
+ node_def=node_def)
+
+# import module snippets
+from ansible.module_utils.basic import *
+main()
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index b908e325b..e458f651b 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -55,3 +55,9 @@
- name: Disable openshift-node if openshift-node is managed externally
service: name=openshift-node enabled=false
when: openshift_node_manage_service_externally
+
+# TODO: expose openshift_register_node options to allow for overriding the
+# defaults.
+- name: Register node (if not already registered)
+ openshift_register_node:
+ name: "{{ openshift_hostname }}"