Merge pull request #121 from detiber/nodeRegistrationChangesMaster

Node registration changes master

1 files changed, 36 insertions, 58 deletions

diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index e0d074572..771cc3a94 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -1,3 +1,4 @@
+---
 - name: node/config.yml, populate oo_nodes_to_config host group if needed
   hosts: localhost
   gather_facts: no
@@ -6,50 +7,42 @@
     add_host: "name={{ item }} groups=oo_nodes_to_config"
     with_items: "{{ oo_host_group_exp | default('') }}"
     when: oo_host_group_exp is defined
-  - name: Find masters for env
-    add_host: "name={{ item }} groups=oo_masters_for_node_config"
-    with_items: groups['tag_env-host-type-' + oo_env + '-openshift-master']
+  - add_host:
+      name: "{{ groups['tag_env-host-type-' ~ cluster_id ~ '-openshift-master'][0] }}"
+      groups: oo_first_master
+    when: oo_host_group_exp is defined
 
-- name: Gather facts for masters in {{ oo_env }}
-  hosts: tag_env-host-type-{{ oo_env }}-openshift-master
-  tasks:
-  - set_fact:
-      openshift_master_ip: "{{ openshift_ip }}"
-      openshift_master_api_url: "{{ openshift_api_url }}"
-      openshift_master_webui_url: "{{ openshift_webui_url }}"
-      openshift_master_hostname: "{{ openshift_hostname }}"
-      openshift_master_public_ip: "{{ openshift_public_ip }}"
-      openshift_master_api_public_url: "{{ openshift_api_public_url }}"
-      openshift_master_webui_public_url: "{{ openshift_webui_public_url }}"
-      openshift_master_public_hostnames: "{{ openshift_public_hostname }}"
 
-- name: Gather facts for hosts to configure
-  hosts: tag_env-host-type-{{ oo_env }}-openshift-node
+- name: Gather and set facts for hosts to configure
+  hosts: oo_nodes_to_config
+  roles:
+  - openshift_facts
   tasks:
-  - set_fact:
-      openshift_node_hostname: "{{ openshift_hostname }}"
-      openshift_node_name: "{{ openshift_hostname }}"
-      openshift_node_cpu: "{{ openshift_node_cpu if openshift_node_cpu else ansible_processor_cores }}"
-      openshift_node_memory: "{{ openshift_node_memory if openshift_node_memory else (ansible_memtotal_mb|int * 1024 * 1024 * 0.75)|int }}"
-      openshift_node_pod_cidr: "{{ openshift_node_pod_cidr if openshift_node_pod_cidr else None }}"
-      openshift_node_host_ip: "{{ openshift_ip }}"
-      openshift_node_labels: "{{ openshift_node_labels if openshift_node_labels else {} }}"
-      openshift_node_annotations: "{{ openshift_node_annotations if openshift_node_annotations else {} }}"
+  # Since the master is registering the nodes before they are configured, we
+  # need to make sure to set the node properties beforehand if we do not want
+  # the defaults
+  - openshift_facts:
+      role: "{{ item.role }}"
+      local_facts: "{{ item.local_facts }}"
+    with_items:
+    - role: common
+      local_facts:
+        hostname: "{{ gce_private_ip }}"
+    - role: node
+      local_facts:
+        external_id: "{{ openshift_node_external_id | default(None) }}"
+        resources_cpu: "{{ openshfit_node_resources_cpu | default(None) }}"
+        resources_memory: "{{ openshfit_node_resources_memory | default(None) }}"
+        pod_cidr: "{{ openshfit_node_pod_cidr | default(None) }}"
+        labels: "{{ openshfit_node_labels | default(None) }}"
+        annotations: "{{ openshfit_node_annotations | default(None) }}"
+
 
 - name: Register nodes
-  hosts: tag_env-host-type-{{ oo_env }}-openshift-master[0]
+  hosts: oo_first_master
   vars:
-    openshift_node_group: tag_env-host-type-{{ oo_env }}-openshift-node
     openshift_nodes: "{{ hostvars
-          | oo_select_keys(groups[openshift_node_group]) }}"
-    openshift_master_group: tag_env-host-type-{{ oo_env }}-openshift-master
-    openshift_master_urls: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_api_url') }}"
-    openshift_master_public_urls: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_api_public_url') }}"
-  pre_tasks:
+          | oo_select_keys(groups['oo_nodes_to_config']) }}"
   roles:
   - openshift_register_nodes
   tasks:
@@ -64,28 +57,14 @@
       src: /var/lib/openshift/openshift.local.certificates
       dest: "{{ mktemp.stdout }}"
 
-# TODO: sync generated certs between masters
-#
 - name: Configure instances
   hosts: oo_nodes_to_config
   vars_files:
   - vars.yml
   vars:
-    openshift_master_group: tag_env-host-type-{{ oo_env }}-openshift-master
-    openshift_master_ips: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_ip') }}"
-    openshift_master_hostnames: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_hostname') }}"
-    openshift_master_public_ips: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_public_ip') }}"
-    openshift_master_public_hostnames: "{{ hostvars
-          | oo_select_keys(groups[openshift_master_group])
-          | oo_collect(attribute='openshift_master_public_hostname') }}"
+    sync_tmpdir: "{{ hostvars[groups['oo_first_master'][0]].mktemp.stdout }}"
     cert_parent_rel_path: openshift.local.certificates
-    cert_rel_path: "{{ cert_parent_rel_path }}/node-{{ openshift_node_name }}"
+    cert_rel_path: "{{ cert_parent_rel_path }}/node-{{ openshift.common.hostname }}"
     cert_base_path: /var/lib/openshift
     cert_parent_path: "{{ cert_base_path }}/{{ cert_parent_rel_path }}"
     cert_path: "{{ cert_base_path }}/{{ cert_rel_path }}"
@@ -98,11 +77,9 @@
     - "{{ cert_path }}"
     - "{{ cert_parent_path }}/ca"
 
-  # TODO: only sync to a node if it's certs have been updated
   # TODO: notify restart openshift-node and/or restart openshift-sdn-node,
   # possibly test service started time against certificate/config file
   # timestamps in openshift-node or openshift-sdn-node to trigger notify
-  # TODO: also copy ca cert: /var/lib/openshift/openshift.local.certificates/ca/cert.crt
   - name: Sync certs to nodes
     synchronize:
       checksum: yes
@@ -111,12 +88,13 @@
       owner: no
       group: no
     with_items:
-    - src: "{{ hostvars[groups[openshift_master_group][0]].mktemp.stdout }}/{{ cert_rel_path }}"
+    - src: "{{ sync_tmpdir }}/{{ cert_rel_path }}"
       dest: "{{ cert_parent_path }}"
-    - src: "{{ hostvars[groups[openshift_master_group][0]].mktemp.stdout }}/{{ cert_parent_rel_path }}/ca/cert.crt"
+    - src: "{{ sync_tmpdir }}/{{ cert_parent_rel_path }}/ca/cert.crt"
       dest: "{{ cert_parent_path }}/ca/cert.crt"
-  - local_action: file name={{ hostvars[groups[openshift_master_group][0]].mktemp.stdout }} state=absent
+  - local_action: file name={{ sync_tmpdir }} state=absent
     run_once: true
   roles:
     - openshift_node
     - os_env_extras
+    - os_env_extras_node