From 7035459d20dd2d278b0a0e6ff96421639f6e0e34 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 18 Mar 2015 00:05:51 -0400
Subject: Register node fixes

- Set --hostname flag in node config in openshift_node role
- Support some additional node attributes in openshift_node role
  - podCIDR
  - labels
  - annotations
- Support both output types for openshift ex config view in
  openshift_register_node module
- Support multiple api versions in openshift_register_node module
- Support additional attributes in openshift_register_node module
  - annotations
  - labels
  - pod_cidr
  - external_ips (v1beta3, will be available after next kube rebase)
  - internal_ips (v1beta3, will be available after next kube rebase)
  - hostnames (v1beta3, will be available after next kube rebase)
  - external_id (v1beta3, will be available after next kube rebase)
---
 roles/openshift_node/defaults/main.yml             |   8 +-
 .../library/openshift_register_node.py             | 453 ++++++++++++++-------
 roles/openshift_node/tasks/main.yml                |  14 +-
 3 files changed, 333 insertions(+), 142 deletions(-)

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index c45524f16..e4d5ebfee 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -5,6 +5,8 @@ os_firewall_allow:
 - service: OpenShift kubelet
   port: 10250/tcp
 openshift_node_resources:
-  capacity:
-    cpu:
-    memory:
+  cpu:
+  memory:
+  cidr:
+openshift_node_labels: {}
+openshift_node_annotations: {}
diff --git a/roles/openshift_node/library/openshift_register_node.py b/roles/openshift_node/library/openshift_register_node.py
index 63079e59b..4922585d7 100644
--- a/roles/openshift_node/library/openshift_register_node.py
+++ b/roles/openshift_node/library/openshift_register_node.py
@@ -6,78 +6,315 @@ import os
 import multiprocessing
 import socket
 from subprocess import check_output, Popen
+from decimal import *
 
 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
+module: kubernetes_register_node
+short_description: Registers a kubernetes node with a master
+description:
+    - Registers a kubernetes node with a master
 options:
     name:
+        default: null
         description:
-            - id for this node (usually the node fqdn)
+            - Identifier for this node (usually the node fqdn).
         required: true
-    hostIP:
+    api_verison:
+        choices: ['v1beta1', 'v1beta3']
+        default: 'v1beta1'
         description:
-            - ip address for this node
+            - Kubernetes API version to use
+        required: true
+    host_ip:
+        default: null
+        description:
+            - IP Address to associate with the node when registering.
+              Available in the following API versions: v1beta1.
         required: false
-    cpu:
+    hostnames:
+        default: []
         description:
-            - number of CPUs for this node
+            - Valid hostnames for this node. Available in the following API
+              versions: v1beta3.
         required: false
-        default: number of logical CPUs detected
-    memory:
+    external_ips:
+        default: []
         description:
-            - Memory available for this node in bytes
+            - External IP Addresses for this node. Available in the following API
+              versions: v1beta3.
         required: false
-        default: 80% MemTotal
-    resources:
+    internal_ips:
+        default: []
         description:
-            - A json string representing Node resources
+            - Internal IP Addresses for this node. Available in the following API
+              versions: v1beta3.
+        required: false
+    cpu:
+        default: null
+        description:
+            - Number of CPUs to allocate for this node. If not provided, then
+              the node will be registered to advertise the number of logical
+              CPUs available. When using the v1beta1 API, you must specify the
+              CPU count as a floating point number with no more than 3 decimal
+              places. API version v1beta3 and newer accepts arbitrary float
+              values.
+        required: false
+    memory:
+        default: null
+        description:
+            - Memory available for this node. If not provided, then the node
+              will be registered to advertise 80% of MemTotal as available
+              memory. When using the v1beta1 API, you must specify the memory
+              size in bytes. API version v1beta3 and newer accepts binary SI
+              and decimal SI values.
         required: false
 '''
 EXAMPLES = '''
 # Minimal node registration
 - openshift_register_node: name=ose3.node.example.com
 
-# Node registration with all options (using cpu and memory options)
+# Node registration using the v1beta1 API and assigning 1 CPU core and 10 GB of
+# Memory
 - openshift_register_node:
     name: ose3.node.example.com
+    api_version: v1beta1
     hostIP: 192.168.1.1
-    apiVersion: v1beta1
     cpu: 1
-    memory: 1073741824
+    memory: 500000000
 
-# Node registration with all options (using resources option)
+# Node registration using the v1beta3 API, setting an alternate hostname,
+# internalIP, externalIP and assigning 3.5 CPU cores and 1 TiB of Memory
 - openshift_register_node:
     name: ose3.node.example.com
-    hostIP: 192.168.1.1
-    apiVersion: v1beta1
-    resources:
-        capacity:
-            cpu: 1
-            memory: 1073741824
+    api_version: v1beta3
+    external_ips: ['192.168.1.5']
+    internal_ips: ['10.0.0.5']
+    hostnames: ['ose2.node.internal.local']
+    cpu: 3.5
+    memory: 1Ti
 '''
 
+
+class ClientConfigException(Exception):
+    pass
+
+class ClientConfig:
+    def __init__(self, client_opts, module):
+        _, output, error = module.run_command(["/usr/bin/openshift", "ex",
+                                               "config", "view", "-o",
+                                               "json"] + client_opts,
+                                              check_rc = True)
+        self.config = json.loads(output)
+
+        if not (bool(self.config['clusters']) or
+                bool(self.config['contexts']) or
+                bool(self.config['current-context']) or
+                bool(self.config['users'])):
+            raise ClientConfigException(msg="Client config missing required " \
+                                            "values",
+                                        output=output)
+
+    def current_context(self):
+        return self.config['current-context']
+
+    def section_has_value(self, section_name, value):
+        section = self.config[section_name]
+        if isinstance(section, dict):
+            return value in section
+        else:
+            val = next((item for item in section
+                      if item['name'] == value), None)
+            return val is not None
+
+    def has_context(self, context):
+        return self.section_has_value('contexts', context)
+
+    def has_user(self, user):
+        return self.section_has_value('users', user)
+
+    def has_cluster(self, cluster):
+        return self.section_has_value('clusters', cluster)
+
+    def get_value_for_context(self, context, attribute):
+        contexts = self.config['contexts']
+        if isinstance(contexts, dict):
+            return contexts[context][attribute]
+        else:
+            return next((c['context'][attribute] for c in contexts
+                      if c['name'] == context), None)
+
+    def get_user_for_context(self, context):
+        return self.get_value_for_context(context, 'user')
+
+    def get_cluster_for_context(self, context):
+        return self.get_value_for_context(context, 'cluster')
+
+class Util:
+    @staticmethod
+    def getLogicalCores():
+        return multiprocessing.cpu_count()
+
+    @staticmethod
+    def getMemoryPct(pct):
+        with open('/proc/meminfo', 'r') as mem:
+            for line in mem:
+                entries = line.split()
+                if str(entries.pop(0)) == 'MemTotal:':
+                    mem_total_kb = Decimal(entries.pop(0))
+                    mem_capacity_kb = mem_total_kb * Decimal(pct)
+                    return str(mem_capacity_kb.to_integral_value() * 1024)
+
+        return ""
+
+    @staticmethod
+    def remove_empty_elements(mapping):
+        if isinstance(mapping, dict):
+            m = mapping.copy()
+            for key, val in mapping.iteritems():
+                if not val:
+                    del m[key]
+            return m
+        else:
+            return mapping
+
+class NodeResources:
+    def __init__(self, version, cpu=None, memory=None):
+        if version == 'v1beta1':
+            self.resources = dict(capacity=dict())
+            self.resources['capacity']['cpu'] = cpu if cpu else Util.getLogicalCores()
+            self.resources['capacity']['memory'] = memory if cpu else Util.getMemoryPct(.75)
+
+    def get_resources(self):
+        return Util.remove_empty_elements(self.resources)
+
+class NodeSpec:
+    def __init__(self, version, cpu=None, memory=None, cidr=None, externalID=None):
+        if version == 'v1beta3':
+            self.spec = dict(podCIDR=cidr, externalID=externalID,
+                             capacity=dict())
+            self.spec['capacity']['cpu'] = cpu if cpu else Util.getLogicalCores()
+            self.spec['capacity']['memory'] = memory if memory else Util.getMemoryPct(.75)
+
+    def get_spec(self):
+        return Util.remove_empty_elements(self.spec)
+
+class NodeStatus:
+    def addAddresses(self, addressType, addresses):
+        addressList = []
+        for address in addresses:
+            addressList.append(dict(type=addressType, address=address))
+        return addressList
+
+    def __init__(self, version, externalIPs = [], internalIPs = [],
+                 hostnames = []):
+        if version == 'v1beta3':
+            self.status = dict(addresses = addAddresses('ExternalIP',
+                                                        externalIPs) +
+                                           addAddresses('InternalIP',
+                                                        internalIPs) +
+                                           addAddresses('Hostname',
+                                                        hostnames))
+
+    def get_status(self):
+        return Util.remove_empty_elements(self.status)
+
+class Node:
+    def __init__(self, module, client_opts, version='v1beta1', name=None,
+                 hostIP = None, hostnames=[], externalIPs=[], internalIPs=[],
+                 cpu=None, memory=None, labels=dict(), annotations=dict(),
+                 podCIDR=None, externalID=None):
+        self.module = module
+        self.client_opts = client_opts
+        if version == 'v1beta1':
+            self.node = dict(id = name,
+                             kind = 'Node',
+                             apiVersion = version,
+                             hostIP = hostIP,
+                             resources = NodeResources(version, cpu, memory),
+                             cidr = podCIDR,
+                             labels = labels,
+                             annotations = annotations
+                        )
+        elif version == 'v1beta3':
+            metadata = dict(name = name,
+                            labels = labels,
+                            annotations = annotations
+                        )
+            self.node = dict(kind = 'Node',
+                             apiVersion = version,
+                             metadata = metadata,
+                             spec = NodeSpec(version, cpu, memory, podCIDR,
+                                             externalID),
+                             status = NodeStatus(version, externalIPs,
+                                                 internalIPs, hostnames),
+                        )
+
+    def get_name(self):
+        if self.node['apiVersion'] == 'v1beta1':
+            return self.node['id']
+        elif self.node['apiVersion'] == 'v1beta3':
+            return self.node['name']
+
+    def get_node(self):
+        node = self.node.copy()
+        if self.node['apiVersion'] == 'v1beta1':
+            node['resources'] = self.node['resources'].get_resources()
+        elif self.node['apiVersion'] == 'v1beta3':
+            node['spec'] = self.node['spec'].get_spec()
+            node['status'] = self.node['status'].get_status()
+        return Util.remove_empty_elements(node)
+
+    def exists(self):
+        _, output, error = self.module.run_command(["/usr/bin/osc", "get",
+                                                    "nodes"] +  self.client_opts,
+                                                   check_rc = True)
+        if re.search(self.module.params['name'], output, re.MULTILINE):
+            return True
+        return False
+
+    def create(self):
+        cmd = ['/usr/bin/osc'] + self.client_opts + ['create', 'node', '-f', '-']
+        rc, output, error = self.module.run_command(cmd,
+                                               data=self.module.jsonify(self.get_node()))
+        if rc != 0:
+            if re.search("minion \"%s\" already exists" % self.get_name(),
+                         error):
+                self.module.exit_json(changed=False,
+                                 msg="node definition already exists",
+                                 node=self.get_node())
+            else:
+                self.module.fail_json(msg="Node creation failed.", rc=rc,
+                                 output=output, error=error,
+                                 node=self.get_node())
+        else:
+            return True
+
 def main():
     module = AnsibleModule(
         argument_spec      = dict(
-            name           = dict(required = True),
-            hostIP         = dict(),
-            apiVersion     = dict(),
-            cpu            = dict(),
-            memory         = dict(),
-            resources      = dict(),
-            client_config  = dict(),
-            client_cluster = dict(default = 'master'),
-            client_context = dict(default = 'master'),
-            client_user    = dict(default = 'admin')
+            name           = dict(required = True, type = 'str'),
+            host_ip        = dict(type = 'str'),
+            hostnames      = dict(type = 'list', default = []),
+            external_ips   = dict(type = 'list', default = []),
+            internal_ips   = dict(type = 'list', default = []),
+            api_version    = dict(type = 'str', default = 'v1beta1', # TODO: after kube rebase, we can default to v1beta3
+                                  choices = ['v1beta1', 'v1beta3']),
+            cpu            = dict(type = 'str'),
+            memory         = dict(type = 'str'),
+            labels         = dict(type = 'dict', default = {}), # TODO: needs documented
+            annotations    = dict(type = 'dict', default = {}), # TODO: needs documented
+            pod_cidr       = dict(type = 'str'), # TODO: needs documented
+            external_id    = dict(type = 'str'), # TODO: needs documented
+            client_config  = dict(type = 'str'), # TODO: needs documented
+            client_cluster = dict(type = 'str', default = 'master'), # TODO: needs documented
+            client_context = dict(type = 'str', default = 'master'), # TODO: needs documented
+            client_user    = dict(type = 'str', default = 'admin') # TODO: needs documented
         ),
         mutually_exclusive = [
-            ['resources', 'cpu'],
-            ['resources', 'memory']
+            ['host_ip', 'external_ips'],
+            ['host_ip', 'internal_ips'],
+            ['host_ip', 'hostnames'],
         ],
         supports_check_mode=True
     )
@@ -93,119 +330,61 @@ def main():
         client_opts.append("--kubeconfig=%s" % module.params['client_config'])
 
     try:
-        output = check_output(["/usr/bin/openshift", "ex", "config", "view",
-                               "-o", "json"] + client_opts,
-                stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        module.fail_json(msg="Failed to get client configuration",
-                command=e.cmd, returncode=e.returncode, output=e.output)
-
-    config = json.loads(output)
-    if not (bool(config['clusters']) or bool(config['contexts']) or
-            bool(config['current-context']) or bool(config['users'])):
-        module.fail_json(msg="Client config missing required values",
-                         output=output)
+        config = ClientConfig(client_opts, module)
+    except ClientConfigException as e:
+        module.fail_json(msg="Failed to get client configuration", exception=e)
 
     client_context = module.params['client_context']
-    if client_context:
-        config_context = next((context for context in config['contexts']
-                               if context['name'] == client_context), None)
-        if not config_context:
-            module.fail_json(msg="Context %s not found in client config" %
-                             client_context)
-        if not config['current-context'] or config['current-context'] != client_context:
+    if config.has_context(client_context):
+        if client_context != config.current_context():
             client_opts.append("--context=%s" % client_context)
+    else:
+        module.fail_json(msg="Context %s not found in client config" %
+                         client_context)
 
     client_user = module.params['client_user']
-    if client_user:
-        config_user = next((user for user in config['users']
-                            if user['name'] == client_user), None)
-        if not config_user:
-            module.fail_json(msg="User %s not found in client config" %
-                             client_user)
-        if client_user != config_context['context']['user']:
+    if config.has_user(client_user):
+        if client_user != config.get_user_for_context(client_context):
             client_opts.append("--user=%s" % client_user)
+    else:
+        module.fail_json(msg="User %s not found in client config" %
+                         client_user)
 
     client_cluster = module.params['client_cluster']
-    if client_cluster:
-        config_cluster = next((cluster for cluster in config['clusters']
-                               if cluster['name'] == client_cluster), None)
-        if not client_cluster:
-            module.fail_json(msg="Cluster %s not found in client config" %
-                             client_cluster)
-        if client_cluster != config_context['context']['cluster']:
+    if config.has_cluster(client_cluster):
+        if client_cluster != config.get_cluster_for_context(client_cluster):
             client_opts.append("--cluster=%s" % client_cluster)
+    else:
+        module.fail_json(msg="Cluster %s not found in client config" %
+                         client_cluster)
 
-    node_def = dict(
-            id = module.params['name'],
-            kind = 'Node',
-            apiVersion = 'v1beta1',
-            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
+    # TODO: provide sane defaults for some (like hostname, externalIP,
+    # internalIP, etc)
+    node = Node(module, client_opts, module.params['api_version'],
+                module.params['name'], module.params['host_ip'],
+                module.params['hostnames'], module.params['external_ips'],
+                module.params['internal_ips'], module.params['cpu'],
+                module.params['memory'], module.params['labels'],
+                module.params['annotations'], module.params['pod_cidr'],
+                module.params['external_id'])
 
-    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_total_kb = int(entries.pop(0))
-                    mem_capacity = int(mem_total_kb * 1024 * .75)
-                    node_def['resources']['capacity']['memory'] = mem_capacity
-                    break
-
-    try:
-        output = check_output(["/usr/bin/osc", "get", "nodes"] +  client_opts,
-                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 re.search(module.params['name'], output, re.MULTILINE):
-        module.exit_json(changed=False, node_def=node_def)
+    # TODO: attempt to support changing node settings where possible and/or
+    # modifying node resources
+    if node.exists():
+        module.exit_json(changed=False, node=node.get_node())
     elif module.check_mode:
-        module.exit_json(changed=True, node_def=node_def)
-
-    config_def = dict(
-        metadata = dict(
-            name = "add-node-%s" % module.params['name']
-        ),
-        kind = 'Config',
-        apiVersion = 'v1beta1',
-        items = [node_def]
-    )
-
-    p = Popen(["/usr/bin/osc"] + client_opts + ["create", "node"] + ["-f", "-"],
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, close_fds=True)
-    (out, err) = p.communicate(module.jsonify(config_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", config_def=config_def)
+        module.exit_json(changed=True, node=node.get_node())
+    else:
+        if node.create():
+            module.exit_json(changed=True,
+                             msg="Node created successfully",
+                             node=node.get_node())
         else:
-            module.fail_json(msg="Node creation failed.", ret=ret, out=out,
-                    err=err, config_def=config_def)
+            module.fail_json(msg="Unknown error creating node",
+                             node=node.get_node())
 
-    module.exit_json(changed=True, out=out, err=err, ret=ret,
-           node_def=config_def)
 
 # import module snippets
 from ansible.module_utils.basic import *
-main()
+if __name__ == '__main__':
+    main()
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 6721c7401..e380ba1fb 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -21,7 +21,7 @@
   lineinfile:
     dest: /etc/sysconfig/openshift-node
     regexp: '^OPTIONS='
-    line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --loglevel={{ openshift_node_debug_level }}\""
+    line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --hostname={{ openshift_hostname }} --loglevel={{ openshift_node_debug_level }}\""
   notify:
   - restart openshift-node
 
@@ -75,4 +75,14 @@
 - name: Register node (if not already registered)
   openshift_register_node:
     name: "{{ openshift_hostname }}"
-    resources: "{{ openshift_node_resources }}"
+    api_version: v1beta1
+    cpu: "{{ openshift_node_resources.cpu }}"
+    memory: "{{ openshift_node_resources.memory }}"
+    pod_cidr: "{{ openshift_node_resources.cidr }}"
+    host_ip: "{{ ansible_default_ipv4.address }}"
+    labels: "{{ openshift_node_labels }}"
+    annotations: "{{ openshift_node_annotations }}"
+    # TODO: support customizing other attributes such as: client_config,
+    # client_cluster, client_context, client_user
+    # TODO: updated for v1beta3 changes after rebase: hostnames, external_ips,
+    # internal_ips, external_id
-- 
cgit v1.2.3


From d67c5b8f79609d2d3b07cc009f58e3dc988782c5 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 23 Mar 2015 16:30:49 -0400
Subject: node registration changes

- Remove default value for openshift_hostname and make it required
- Remove workarounds that are no longer needed
- Remove resources parameter from openshift_register_node module
- pre-create node certificates for each node before registering node
- distribute created node certificates to each node
- Move node registration logic to a new openshift_register_nodes role
  - This is because we now have to run the steps on a master as opposed to on
    the nodes like we were previously doing.
- Rename openshift_register_node module to kubernetes_register_node, one more
  step to genericizing enough for upstreaming, however there are still plenty
  of openshift specific commands that still need to be genericized.
---
 roles/openshift_node/README.md                     |   3 +-
 roles/openshift_node/defaults/main.yml             |   6 -
 .../library/openshift_register_node.py             | 390 ---------------------
 roles/openshift_node/tasks/main.yml                |  68 +---
 4 files changed, 20 insertions(+), 447 deletions(-)
 delete mode 100644 roles/openshift_node/library/openshift_register_node.py

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index 9210bab16..d537a35a5 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -21,7 +21,6 @@ From this role:
 | openshift_master_public_ips              | UNDEF (Required)      | List of the public IPs for the openhift-master hosts |
 | openshift_master_ips                     | UNDEF (Required)      | List of IP addresses for the openshift-master hosts to be used for node -> master communication |
 | openshift_registry_url                   | UNDEF (Optional)      | Default docker registry to use |
-| openshift_node_resources                 | { capacity: { cpu: , memory: } } | Resource specification for this node, cpu is the number of CPUs to advertise and memory is the amount of memory in bytes to advertise. Default values chosen when not set are the number of logical CPUs for the host and 75% of total system memory |
 
 From openshift_common:
 | Name                          |  Default Value      |                     | 
@@ -29,7 +28,7 @@ From openshift_common:
 | openshift_debug_level         | 0                   | Global openshift debug log verbosity |
 | openshift_hostname_workaround | True                |                     |
 | openshift_public_ip           | UNDEF (Required)    | Public IP address to use for this host |
-| openshift_hostname            | openshift_public_ip if openshift_hostname_workaround else ansible_fqdn | hostname to use for this instance |
+| openshift_hostname            | UNDEF (Required)    | hostname to use for this instance |
 
 Dependencies
 ------------
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index e4d5ebfee..6dc73a96e 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -4,9 +4,3 @@ openshift_node_debug_level: "{{ openshift_debug_level | default(0) }}"
 os_firewall_allow:
 - service: OpenShift kubelet
   port: 10250/tcp
-openshift_node_resources:
-  cpu:
-  memory:
-  cidr:
-openshift_node_labels: {}
-openshift_node_annotations: {}
diff --git a/roles/openshift_node/library/openshift_register_node.py b/roles/openshift_node/library/openshift_register_node.py
deleted file mode 100644
index 4922585d7..000000000
--- a/roles/openshift_node/library/openshift_register_node.py
+++ /dev/null
@@ -1,390 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# vim: expandtab:tabstop=4:shiftwidth=4
-
-import os
-import multiprocessing
-import socket
-from subprocess import check_output, Popen
-from decimal import *
-
-DOCUMENTATION = '''
----
-module: kubernetes_register_node
-short_description: Registers a kubernetes node with a master
-description:
-    - Registers a kubernetes node with a master
-options:
-    name:
-        default: null
-        description:
-            - Identifier for this node (usually the node fqdn).
-        required: true
-    api_verison:
-        choices: ['v1beta1', 'v1beta3']
-        default: 'v1beta1'
-        description:
-            - Kubernetes API version to use
-        required: true
-    host_ip:
-        default: null
-        description:
-            - IP Address to associate with the node when registering.
-              Available in the following API versions: v1beta1.
-        required: false
-    hostnames:
-        default: []
-        description:
-            - Valid hostnames for this node. Available in the following API
-              versions: v1beta3.
-        required: false
-    external_ips:
-        default: []
-        description:
-            - External IP Addresses for this node. Available in the following API
-              versions: v1beta3.
-        required: false
-    internal_ips:
-        default: []
-        description:
-            - Internal IP Addresses for this node. Available in the following API
-              versions: v1beta3.
-        required: false
-    cpu:
-        default: null
-        description:
-            - Number of CPUs to allocate for this node. If not provided, then
-              the node will be registered to advertise the number of logical
-              CPUs available. When using the v1beta1 API, you must specify the
-              CPU count as a floating point number with no more than 3 decimal
-              places. API version v1beta3 and newer accepts arbitrary float
-              values.
-        required: false
-    memory:
-        default: null
-        description:
-            - Memory available for this node. If not provided, then the node
-              will be registered to advertise 80% of MemTotal as available
-              memory. When using the v1beta1 API, you must specify the memory
-              size in bytes. API version v1beta3 and newer accepts binary SI
-              and decimal SI values.
-        required: false
-'''
-EXAMPLES = '''
-# Minimal node registration
-- openshift_register_node: name=ose3.node.example.com
-
-# Node registration using the v1beta1 API and assigning 1 CPU core and 10 GB of
-# Memory
-- openshift_register_node:
-    name: ose3.node.example.com
-    api_version: v1beta1
-    hostIP: 192.168.1.1
-    cpu: 1
-    memory: 500000000
-
-# Node registration using the v1beta3 API, setting an alternate hostname,
-# internalIP, externalIP and assigning 3.5 CPU cores and 1 TiB of Memory
-- openshift_register_node:
-    name: ose3.node.example.com
-    api_version: v1beta3
-    external_ips: ['192.168.1.5']
-    internal_ips: ['10.0.0.5']
-    hostnames: ['ose2.node.internal.local']
-    cpu: 3.5
-    memory: 1Ti
-'''
-
-
-class ClientConfigException(Exception):
-    pass
-
-class ClientConfig:
-    def __init__(self, client_opts, module):
-        _, output, error = module.run_command(["/usr/bin/openshift", "ex",
-                                               "config", "view", "-o",
-                                               "json"] + client_opts,
-                                              check_rc = True)
-        self.config = json.loads(output)
-
-        if not (bool(self.config['clusters']) or
-                bool(self.config['contexts']) or
-                bool(self.config['current-context']) or
-                bool(self.config['users'])):
-            raise ClientConfigException(msg="Client config missing required " \
-                                            "values",
-                                        output=output)
-
-    def current_context(self):
-        return self.config['current-context']
-
-    def section_has_value(self, section_name, value):
-        section = self.config[section_name]
-        if isinstance(section, dict):
-            return value in section
-        else:
-            val = next((item for item in section
-                      if item['name'] == value), None)
-            return val is not None
-
-    def has_context(self, context):
-        return self.section_has_value('contexts', context)
-
-    def has_user(self, user):
-        return self.section_has_value('users', user)
-
-    def has_cluster(self, cluster):
-        return self.section_has_value('clusters', cluster)
-
-    def get_value_for_context(self, context, attribute):
-        contexts = self.config['contexts']
-        if isinstance(contexts, dict):
-            return contexts[context][attribute]
-        else:
-            return next((c['context'][attribute] for c in contexts
-                      if c['name'] == context), None)
-
-    def get_user_for_context(self, context):
-        return self.get_value_for_context(context, 'user')
-
-    def get_cluster_for_context(self, context):
-        return self.get_value_for_context(context, 'cluster')
-
-class Util:
-    @staticmethod
-    def getLogicalCores():
-        return multiprocessing.cpu_count()
-
-    @staticmethod
-    def getMemoryPct(pct):
-        with open('/proc/meminfo', 'r') as mem:
-            for line in mem:
-                entries = line.split()
-                if str(entries.pop(0)) == 'MemTotal:':
-                    mem_total_kb = Decimal(entries.pop(0))
-                    mem_capacity_kb = mem_total_kb * Decimal(pct)
-                    return str(mem_capacity_kb.to_integral_value() * 1024)
-
-        return ""
-
-    @staticmethod
-    def remove_empty_elements(mapping):
-        if isinstance(mapping, dict):
-            m = mapping.copy()
-            for key, val in mapping.iteritems():
-                if not val:
-                    del m[key]
-            return m
-        else:
-            return mapping
-
-class NodeResources:
-    def __init__(self, version, cpu=None, memory=None):
-        if version == 'v1beta1':
-            self.resources = dict(capacity=dict())
-            self.resources['capacity']['cpu'] = cpu if cpu else Util.getLogicalCores()
-            self.resources['capacity']['memory'] = memory if cpu else Util.getMemoryPct(.75)
-
-    def get_resources(self):
-        return Util.remove_empty_elements(self.resources)
-
-class NodeSpec:
-    def __init__(self, version, cpu=None, memory=None, cidr=None, externalID=None):
-        if version == 'v1beta3':
-            self.spec = dict(podCIDR=cidr, externalID=externalID,
-                             capacity=dict())
-            self.spec['capacity']['cpu'] = cpu if cpu else Util.getLogicalCores()
-            self.spec['capacity']['memory'] = memory if memory else Util.getMemoryPct(.75)
-
-    def get_spec(self):
-        return Util.remove_empty_elements(self.spec)
-
-class NodeStatus:
-    def addAddresses(self, addressType, addresses):
-        addressList = []
-        for address in addresses:
-            addressList.append(dict(type=addressType, address=address))
-        return addressList
-
-    def __init__(self, version, externalIPs = [], internalIPs = [],
-                 hostnames = []):
-        if version == 'v1beta3':
-            self.status = dict(addresses = addAddresses('ExternalIP',
-                                                        externalIPs) +
-                                           addAddresses('InternalIP',
-                                                        internalIPs) +
-                                           addAddresses('Hostname',
-                                                        hostnames))
-
-    def get_status(self):
-        return Util.remove_empty_elements(self.status)
-
-class Node:
-    def __init__(self, module, client_opts, version='v1beta1', name=None,
-                 hostIP = None, hostnames=[], externalIPs=[], internalIPs=[],
-                 cpu=None, memory=None, labels=dict(), annotations=dict(),
-                 podCIDR=None, externalID=None):
-        self.module = module
-        self.client_opts = client_opts
-        if version == 'v1beta1':
-            self.node = dict(id = name,
-                             kind = 'Node',
-                             apiVersion = version,
-                             hostIP = hostIP,
-                             resources = NodeResources(version, cpu, memory),
-                             cidr = podCIDR,
-                             labels = labels,
-                             annotations = annotations
-                        )
-        elif version == 'v1beta3':
-            metadata = dict(name = name,
-                            labels = labels,
-                            annotations = annotations
-                        )
-            self.node = dict(kind = 'Node',
-                             apiVersion = version,
-                             metadata = metadata,
-                             spec = NodeSpec(version, cpu, memory, podCIDR,
-                                             externalID),
-                             status = NodeStatus(version, externalIPs,
-                                                 internalIPs, hostnames),
-                        )
-
-    def get_name(self):
-        if self.node['apiVersion'] == 'v1beta1':
-            return self.node['id']
-        elif self.node['apiVersion'] == 'v1beta3':
-            return self.node['name']
-
-    def get_node(self):
-        node = self.node.copy()
-        if self.node['apiVersion'] == 'v1beta1':
-            node['resources'] = self.node['resources'].get_resources()
-        elif self.node['apiVersion'] == 'v1beta3':
-            node['spec'] = self.node['spec'].get_spec()
-            node['status'] = self.node['status'].get_status()
-        return Util.remove_empty_elements(node)
-
-    def exists(self):
-        _, output, error = self.module.run_command(["/usr/bin/osc", "get",
-                                                    "nodes"] +  self.client_opts,
-                                                   check_rc = True)
-        if re.search(self.module.params['name'], output, re.MULTILINE):
-            return True
-        return False
-
-    def create(self):
-        cmd = ['/usr/bin/osc'] + self.client_opts + ['create', 'node', '-f', '-']
-        rc, output, error = self.module.run_command(cmd,
-                                               data=self.module.jsonify(self.get_node()))
-        if rc != 0:
-            if re.search("minion \"%s\" already exists" % self.get_name(),
-                         error):
-                self.module.exit_json(changed=False,
-                                 msg="node definition already exists",
-                                 node=self.get_node())
-            else:
-                self.module.fail_json(msg="Node creation failed.", rc=rc,
-                                 output=output, error=error,
-                                 node=self.get_node())
-        else:
-            return True
-
-def main():
-    module = AnsibleModule(
-        argument_spec      = dict(
-            name           = dict(required = True, type = 'str'),
-            host_ip        = dict(type = 'str'),
-            hostnames      = dict(type = 'list', default = []),
-            external_ips   = dict(type = 'list', default = []),
-            internal_ips   = dict(type = 'list', default = []),
-            api_version    = dict(type = 'str', default = 'v1beta1', # TODO: after kube rebase, we can default to v1beta3
-                                  choices = ['v1beta1', 'v1beta3']),
-            cpu            = dict(type = 'str'),
-            memory         = dict(type = 'str'),
-            labels         = dict(type = 'dict', default = {}), # TODO: needs documented
-            annotations    = dict(type = 'dict', default = {}), # TODO: needs documented
-            pod_cidr       = dict(type = 'str'), # TODO: needs documented
-            external_id    = dict(type = 'str'), # TODO: needs documented
-            client_config  = dict(type = 'str'), # TODO: needs documented
-            client_cluster = dict(type = 'str', default = 'master'), # TODO: needs documented
-            client_context = dict(type = 'str', default = 'master'), # TODO: needs documented
-            client_user    = dict(type = 'str', default = 'admin') # TODO: needs documented
-        ),
-        mutually_exclusive = [
-            ['host_ip', 'external_ips'],
-            ['host_ip', 'internal_ips'],
-            ['host_ip', 'hostnames'],
-        ],
-        supports_check_mode=True
-    )
-
-    user_has_client_config = os.path.exists(os.path.expanduser('~/.kube/.kubeconfig'))
-    if not (user_has_client_config or module.params['client_config']):
-        module.fail_json(msg="Could not locate client configuration, "
-                         "client_config must be specified if "
-                         "~/.kube/.kubeconfig is not present")
-
-    client_opts = []
-    if module.params['client_config']:
-        client_opts.append("--kubeconfig=%s" % module.params['client_config'])
-
-    try:
-        config = ClientConfig(client_opts, module)
-    except ClientConfigException as e:
-        module.fail_json(msg="Failed to get client configuration", exception=e)
-
-    client_context = module.params['client_context']
-    if config.has_context(client_context):
-        if client_context != config.current_context():
-            client_opts.append("--context=%s" % client_context)
-    else:
-        module.fail_json(msg="Context %s not found in client config" %
-                         client_context)
-
-    client_user = module.params['client_user']
-    if config.has_user(client_user):
-        if client_user != config.get_user_for_context(client_context):
-            client_opts.append("--user=%s" % client_user)
-    else:
-        module.fail_json(msg="User %s not found in client config" %
-                         client_user)
-
-    client_cluster = module.params['client_cluster']
-    if config.has_cluster(client_cluster):
-        if client_cluster != config.get_cluster_for_context(client_cluster):
-            client_opts.append("--cluster=%s" % client_cluster)
-    else:
-        module.fail_json(msg="Cluster %s not found in client config" %
-                         client_cluster)
-
-    # TODO: provide sane defaults for some (like hostname, externalIP,
-    # internalIP, etc)
-    node = Node(module, client_opts, module.params['api_version'],
-                module.params['name'], module.params['host_ip'],
-                module.params['hostnames'], module.params['external_ips'],
-                module.params['internal_ips'], module.params['cpu'],
-                module.params['memory'], module.params['labels'],
-                module.params['annotations'], module.params['pod_cidr'],
-                module.params['external_id'])
-
-    # TODO: attempt to support changing node settings where possible and/or
-    # modifying node resources
-    if node.exists():
-        module.exit_json(changed=False, node=node.get_node())
-    elif module.check_mode:
-        module.exit_json(changed=True, node=node.get_node())
-    else:
-        if node.create():
-            module.exit_json(changed=True,
-                             msg="Node created successfully",
-                             node=node.get_node())
-        else:
-            module.fail_json(msg="Unknown error creating node",
-                             node=node.get_node())
-
-
-# import module snippets
-from ansible.module_utils.basic import *
-if __name__ == '__main__':
-    main()
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e380ba1fb..c039e3f05 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -1,27 +1,29 @@
 ---
+- name: Test if node certs and config exist
+  stat: path={{ item }}
+  failed_when: not result.stat.exists
+  register: result
+  with_items:
+  - "{{ cert_path }}"
+  - "{{ cert_path }}/cert.crt"
+  - "{{ cert_path }}/key.key"
+  - "{{ cert_path }}/.kubeconfig"
+  - "{{ cert_path }}/server.crt"
+  - "{{ cert_path }}/server.key"
+  - "{{ cert_parent_path }}/ca/cert.crt"
+  #- "{{ cert_path }}/node.yaml"
+
 - name: Install OpenShift Node package
   yum: pkg=openshift-node state=installed
 
-- local_action: command /usr/bin/mktemp -d /tmp/openshift-ansible-XXXXXXX
-  register: mktemp
-
-- name: Retrieve OpenShift Master credentials
-  local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' root@{{ openshift_master_public_ips[0] }}:/var/lib/openshift/openshift.local.certificates/admin/ {{ mktemp.stdout }}
-  ignore_errors: yes
-
-- file: path=/var/lib/openshift/openshift.local.certificates/admin state=directory
-
-- name: Store OpenShift Master credentials
-  local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' {{ mktemp.stdout }}/ root@{{ openshift_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin
-  ignore_errors: yes
-
-- local_action: file name={{ mktemp.stdout }} state=absent
-
+# --create-certs=false is a temporary workaround until
+# https://github.com/openshift/origin/pull/1361 is merged upstream and it is
+# the default for nodes
 - name: Configure OpenShift Node settings
   lineinfile:
     dest: /etc/sysconfig/openshift-node
     regexp: '^OPTIONS='
-    line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --hostname={{ openshift_hostname }} --loglevel={{ openshift_node_debug_level }}\""
+    line: "OPTIONS=\"--hostname={{ openshift_hostname }} --loglevel={{ openshift_node_debug_level }} --create-certs=false\""
   notify:
   - restart openshift-node
 
@@ -47,42 +49,10 @@
     option: externally_managed
     value: "{{ openshift_node_manage_service_externally }}"
 
-# fixme: Once the openshift_cluster playbook is published state should be started
-# Always bounce service to pick up new credentials
 - name: Start and enable openshift-node
-  service: name=openshift-node enabled=yes state=restarted
+  service: name=openshift-node enabled=yes state=started
   when: not openshift_node_manage_service_externally
 
 - name: Disable openshift-node if openshift-node is managed externally
   service: name=openshift-node enabled=false
   when: openshift_node_manage_service_externally
-
-# TODO: create an os_vars role that has generic env related config and move
-# the root kubeconfig setting there, cannot use dependencies to force ordering
-# with openshift_node and openshift_master because the way conditional
-# dependencies work with current ansible would also exclude the
-# openshift_common dependency.
-- name: Create .kube directory
-  file:
-    path: /root/.kube
-    state: directory
-    mode: 0700
-- name: Configure root user kubeconfig
-  command: cp /var/lib/openshift/openshift.local.certificates/admin/.kubeconfig /root/.kube/.kubeconfig
-  args:
-    creates: /root/.kube/.kubeconfig
-
-- name: Register node (if not already registered)
-  openshift_register_node:
-    name: "{{ openshift_hostname }}"
-    api_version: v1beta1
-    cpu: "{{ openshift_node_resources.cpu }}"
-    memory: "{{ openshift_node_resources.memory }}"
-    pod_cidr: "{{ openshift_node_resources.cidr }}"
-    host_ip: "{{ ansible_default_ipv4.address }}"
-    labels: "{{ openshift_node_labels }}"
-    annotations: "{{ openshift_node_annotations }}"
-    # TODO: support customizing other attributes such as: client_config,
-    # client_cluster, client_context, client_user
-    # TODO: updated for v1beta3 changes after rebase: hostnames, external_ips,
-    # internal_ips, external_id
-- 
cgit v1.2.3


From de1391db4309f020b5c8467597eef527b560bbaa Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 23 Mar 2015 23:36:08 -0400
Subject: remove openshift_hostname_workaround var for openshift_common, rather
 rely on inventory/playbook variables for openshift_hostname

---
 roles/openshift_node/README.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index d537a35a5..c9b4eab34 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -26,7 +26,6 @@ From openshift_common:
 | Name                          |  Default Value      |                     | 
 |-------------------------------|---------------------|---------------------|
 | openshift_debug_level         | 0                   | Global openshift debug log verbosity |
-| openshift_hostname_workaround | True                |                     |
 | openshift_public_ip           | UNDEF (Required)    | Public IP address to use for this host |
 | openshift_hostname            | UNDEF (Required)    | hostname to use for this instance |
 
-- 
cgit v1.2.3


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
---
 roles/openshift_node/README.md         |  3 ---
 roles/openshift_node/defaults/main.yml |  2 --
 roles/openshift_node/handlers/main.yml |  2 +-
 roles/openshift_node/tasks/main.yml    | 27 +++++++++++----------------
 roles/openshift_node/vars/main.yml     |  2 --
 5 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 roles/openshift_node/vars/main.yml

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index c9b4eab34..83359f164 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -16,10 +16,7 @@ Role Variables
 From this role:
 | Name                                     | Default value         |                                        |
 |------------------------------------------|-----------------------|----------------------------------------|
-| openshift_node_manage_service_externally | False                 | Should the openshift-node role manage the openshift-node service? |
 | openshift_node_debug_level               | openshift_debug_level | Verbosity of the debug logs for openshift-node |
-| openshift_master_public_ips              | UNDEF (Required)      | List of the public IPs for the openhift-master hosts |
-| openshift_master_ips                     | UNDEF (Required)      | List of IP addresses for the openshift-master hosts to be used for node -> master communication |
 | openshift_registry_url                   | UNDEF (Optional)      | Default docker registry to use |
 
 From openshift_common:
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index 6dc73a96e..df7ec41b6 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-openshift_node_manage_service_externally: false
-openshift_node_debug_level: "{{ openshift_debug_level | default(0) }}"
 os_firewall_allow:
 - service: OpenShift kubelet
   port: 10250/tcp
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index f7aa36d88..ca2992637 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: restart openshift-node
   service: name=openshift-node state=restarted
-  when: not openshift_node_manage_service_externally
+  when: not openshift.common.use_openshift_sdn|bool
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index c039e3f05..8cfef0e15 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+# TODO: allow for overriding default ports where possible
+# TODO: trigger the external service when restart is needed
+- name: Set node OpenShift facts
+  openshift_facts:
+    role: 'node'
+    local_facts:
+      debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}"
+
 - name: Test if node certs and config exist
   stat: path={{ item }}
   failed_when: not result.stat.exists
@@ -23,7 +31,7 @@
   lineinfile:
     dest: /etc/sysconfig/openshift-node
     regexp: '^OPTIONS='
-    line: "OPTIONS=\"--hostname={{ openshift_hostname }} --loglevel={{ openshift_node_debug_level }} --create-certs=false\""
+    line: "OPTIONS=\"--hostname={{ openshift.common.hostname }} --loglevel={{ openshift.node.debug_level }} --create-certs=false\""
   notify:
   - restart openshift-node
 
@@ -36,23 +44,10 @@
   notify:
   - restart openshift-node
 
-- name: Set OpenShift node facts
-  include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
-  facts:
-  - section: node
-    option: debug_level
-    value: "{{ openshift_node_debug_level }}"
-  - section: node
-    option: public_ip
-    value: "{{ openshift_public_ip }}"
-  - section: node
-    option: externally_managed
-    value: "{{ openshift_node_manage_service_externally }}"
-
 - name: Start and enable openshift-node
   service: name=openshift-node enabled=yes state=started
-  when: not openshift_node_manage_service_externally
+  when: not openshift.common.use_openshift_sdn|bool
 
 - name: Disable openshift-node if openshift-node is managed externally
   service: name=openshift-node enabled=false
-  when: openshift_node_manage_service_externally
+  when: openshift.common.use_openshift_sdn|bool
diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml
deleted file mode 100644
index 9841d52f9..000000000
--- a/roles/openshift_node/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-openshift_host_type: node
-- 
cgit v1.2.3


From 8a4888ad30ce7c5898caac47614da2e13a759320 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Sun, 1 Mar 2015 00:27:04 -0500
Subject: Add byo playbooks and enterprise docs

- added byo playbooks
- added byo (example) inventory
- added a README_OSE.md for getting started with Enterprise deployments
- Added an ansible.cfg as an example for configuration helpful for
  playbooks/roles
---
 roles/openshift_node/tasks/main.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 8cfef0e15..e3c04585b 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 # TODO: allow for overriding default ports where possible
 # TODO: trigger the external service when restart is needed
+
 - name: Set node OpenShift facts
   openshift_facts:
     role: 'node'
-- 
cgit v1.2.3


From 6a4b7a5eb6c4b5e747bab795e2428d7c3992f559 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 1 Apr 2015 15:09:19 -0400
Subject: Configuration updates for latest builds and major refactor

Configuration updates for latest builds
- Switch to using create-node-config
- Switch sdn services to use etcd over SSL
- This re-uses the client certificate deployed on each node
- Additional node registration changes
- Do not assume that metadata service is available in openshift_facts module
- Call systemctl daemon-reload after installing openshift-master, openshift-sdn-master, openshift-node, openshift-sdn-node
- Fix bug overriding openshift_hostname and openshift_public_hostname in byo playbooks
- Start moving generated configs to /etc/openshift
- Some custom module cleanup
- Add known issue with ansible-1.9 to README_OSE.md
- Update to genericize the kubernetes_register_node module
  - Default to use kubectl for commands
  - Allow for overriding kubectl_cmd
  - In openshift_register_node role, override kubectl_cmd to openshift_kube
- Set default openshift_registry_url for enterprise when deployment_type is enterprise
- Fix openshift_register_node for client config change
- Ensure that master certs directory is created
- Add roles and filter_plugin symlinks to playbooks/common/openshift-master and node
- Allow non-root user with sudo nopasswd access
- Updates for README_OSE.md
- Update byo inventory for adding additional comments
- Updates for node cert/config sync to work with non-root user using sudo
- Move node config/certs to /etc/openshift/node
- Don't use path for mktemp. addresses: https://github.com/openshift/openshift-ansible/issues/154

Create common playbooks
- create common/openshift-master/config.yml
- create common/openshift-node/config.yml
- update playbooks to use new common playbooks
- update launch playbooks to call update playbooks
- fix openshift_registry and openshift_node_ip usage

Set default deployment type to origin
- openshift_repo updates for enabling origin deployments
  - also separate repo and gpgkey file structure
  - remove kubernetes repo since it isn't currently needed
- full deployment type support for bin/cluster
  - honor OS_DEPLOYMENT_TYPE env variable
  - add --deployment-type option, which will override OS_DEPLOYMENT_TYPE if set
  - if neither OS_DEPLOYMENT_TYPE or --deployment-type is set, defaults to
    origin installs

Additional changes:
- Add separate config action to bin/cluster that runs ansible config but does
  not update packages
- Some more duplication reduction in cluster playbooks.
- Rename task files in playbooks dirs to have tasks in their name for clarity.
- update aws/gce scripts to use a directory for inventory (otherwise when
  there are no hosts returned from dynamic inventory there is an error)

libvirt refactor and update

- add libvirt dynamic inventory
- updates to use dynamic inventory for libvirt
---
 roles/openshift_node/tasks/main.yml | 32 ++++++++++++++------------------
 roles/openshift_node/vars/main.yml  |  2 ++
 2 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 roles/openshift_node/vars/main.yml

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e3c04585b..3d56bdd67 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -13,17 +13,22 @@
   failed_when: not result.stat.exists
   register: result
   with_items:
-  - "{{ cert_path }}"
-  - "{{ cert_path }}/cert.crt"
-  - "{{ cert_path }}/key.key"
-  - "{{ cert_path }}/.kubeconfig"
-  - "{{ cert_path }}/server.crt"
-  - "{{ cert_path }}/server.key"
-  - "{{ cert_parent_path }}/ca/cert.crt"
-  #- "{{ cert_path }}/node.yaml"
+  - "{{ openshift_node_cert_dir }}"
+  - "{{ openshift_node_cert_dir }}/ca.crt"
+  - "{{ openshift_node_cert_dir }}/client.crt"
+  - "{{ openshift_node_cert_dir }}/client.key"
+  - "{{ openshift_node_cert_dir }}/.kubeconfig"
+  - "{{ openshift_node_cert_dir }}/node-config.yaml"
+  - "{{ openshift_node_cert_dir }}/server.crt"
+  - "{{ openshift_node_cert_dir }}/server.key"
 
 - name: Install OpenShift Node package
   yum: pkg=openshift-node state=installed
+  register: install_result
+
+- name: Reload systemd units
+  command: systemctl daemon-reload
+  when: install_result | changed
 
 # --create-certs=false is a temporary workaround until
 # https://github.com/openshift/origin/pull/1361 is merged upstream and it is
@@ -32,16 +37,7 @@
   lineinfile:
     dest: /etc/sysconfig/openshift-node
     regexp: '^OPTIONS='
-    line: "OPTIONS=\"--hostname={{ openshift.common.hostname }} --loglevel={{ openshift.node.debug_level }} --create-certs=false\""
-  notify:
-  - restart openshift-node
-
-- name: Set default registry url
-  lineinfile:
-    dest: /etc/sysconfig/openshift-node
-    regexp: '^IMAGES='
-    line: "IMAGES={{ openshift_registry_url }}"
-  when: openshift_registry_url is defined
+    line: "OPTIONS=\"--loglevel={{ openshift.node.debug_level }} --config={{ openshift_node_cert_dir }}/node-config.yaml\""
   notify:
   - restart openshift-node
 
diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml
new file mode 100644
index 000000000..c6be83139
--- /dev/null
+++ b/roles/openshift_node/vars/main.yml
@@ -0,0 +1,2 @@
+---
+openshift_node_cert_dir: /etc/openshift/node
-- 
cgit v1.2.3