From 7d74d1913274cba4c4732cbc5f0a573cb99e5248 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 12 Feb 2015 11:26:56 -0700 Subject: - Rename minion to node - Update playbooks to support latest code --- playbooks/gce/openshift-node/config.yml | 55 ++++++++++++++++++++++++++++++ playbooks/gce/openshift-node/launch.yml | 47 +++++++++++++++++++++++++ playbooks/gce/openshift-node/terminate.yml | 41 ++++++++++++++++++++++ playbooks/gce/openshift-node/vars.yml | 0 4 files changed, 143 insertions(+) create mode 100644 playbooks/gce/openshift-node/config.yml create mode 100644 playbooks/gce/openshift-node/launch.yml create mode 100644 playbooks/gce/openshift-node/terminate.yml create mode 100644 playbooks/gce/openshift-node/vars.yml (limited to 'playbooks/gce/openshift-node') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml new file mode 100644 index 000000000..1f201902f --- /dev/null +++ b/playbooks/gce/openshift-node/config.yml @@ -0,0 +1,55 @@ +- name: "populate oo_hosts_to_config host group if needed" + hosts: localhost + gather_facts: no + tasks: + - name: Evaluate oo_host_group_exp + add_host: "name={{ item }} groups=oo_hosts_to_config" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + +- name: "Gather facts for masters in {{ oo_env }}" + hosts: "tag_env-host-type-{{ oo_env }}-openshift-master" + connection: ssh + user: root + +- name: "Set OO sepcific facts on localhost (for later use)" + hosts: localhost + gather_facts: no + tasks: + - name: Setting oo_master_ips fact on localhost + set_fact: + oo_master_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master']) + | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined + - name: Setting oo_master_public_ips fact on localhost + set_fact: + oo_master_public_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master']) + | oo_collect(attribute='gce_public_ip') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined + +- name: "Debug hostvars" + hosts: oo_hosts_to_config + connection: ssh + user: root + tasks: + - debug: var=hostvars + +- name: "Configure instances" + hosts: oo_hosts_to_config + connection: ssh + user: root + vars_files: + - vars.yml + roles: + - ../../../roles/base_os + - ../../../roles/repos + - ../../../roles/docker + - { + role: ../../../roles/openshift_node, + oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", + oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", + oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" + } diff --git a/playbooks/gce/openshift-node/launch.yml b/playbooks/gce/openshift-node/launch.yml new file mode 100644 index 000000000..f2800b061 --- /dev/null +++ b/playbooks/gce/openshift-node/launch.yml @@ -0,0 +1,47 @@ +--- +- name: Launch instance(s) + hosts: localhost + connection: local + gather_facts: no + + vars: + inst_names: "{{ oo_new_inst_names }}" + machine_type: n1-standard-1 + image: libra-rhel7 + + vars_files: + - vars.yml + + tasks: + - name: Launch instances + gce: + instance_names: "{{ inst_names }}" + machine_type: "{{ machine_type }}" + image: "{{ image }}" + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + tags: "{{ oo_new_inst_tags }}" + register: gce + + - name: Add new instances public IPs to oo_hosts_to_config + add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" + with_items: gce.instance_data + + - name: Wait for ssh + wait_for: "port=22 host={{ item.public_ip }}" + with_items: gce.instance_data + + - debug: var=gce + + - name: Wait for root user setup + command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null root@{{ item.public_ip }} echo root user is setup" + register: result + until: result.rc == 0 + retries: 20 + delay: 10 + with_items: gce.instance_data + + +# Apply the configs, separate so that just the configs can be run by themselves +- include: config.yml diff --git a/playbooks/gce/openshift-node/terminate.yml b/playbooks/gce/openshift-node/terminate.yml new file mode 100644 index 000000000..8d60f27b3 --- /dev/null +++ b/playbooks/gce/openshift-node/terminate.yml @@ -0,0 +1,41 @@ +- name: "populate oo_hosts_to_terminate host group if needed" + hosts: localhost + gather_facts: no + tasks: + - debug: var=oo_host_group_exp + + - name: Evaluate oo_host_group_exp if it's set + add_host: "name={{ item }} groups=oo_hosts_to_terminate" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + + - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" + + +- name: Terminate instances + hosts: localhost + connection: local + tasks: + - name: Terminate node instances + gce: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + state: 'absent' + instance_names: "{{ groups['oo_hosts_to_terminate'] }}" + disks: "{{ groups['oo_hosts_to_terminate'] }}" + register: gce + + - debug: var=gce + + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names + + diff --git a/playbooks/gce/openshift-node/vars.yml b/playbooks/gce/openshift-node/vars.yml new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From 90010f6db6294a99c56194afd89a0359a3d278dc Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Mon, 16 Feb 2015 17:57:08 -0700 Subject: Update code to reflect review comments --- playbooks/gce/openshift-node/config.yml | 15 +++++++-------- roles/openshift_node/tasks/main.yml | 7 +++++-- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'playbooks/gce/openshift-node') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index 1f201902f..10016463b 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/playbooks/gce/openshift-node/config.yml @@ -1,6 +1,7 @@ - name: "populate oo_hosts_to_config host group if needed" hosts: localhost gather_facts: no + tasks: - name: Evaluate oo_host_group_exp add_host: "name={{ item }} groups=oo_hosts_to_config" @@ -29,17 +30,14 @@ | oo_collect(attribute='gce_public_ip') }}" when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined -- name: "Debug hostvars" - hosts: oo_hosts_to_config - connection: ssh - user: root - tasks: - - debug: var=hostvars - - name: "Configure instances" hosts: oo_hosts_to_config connection: ssh user: root + + vars: + tmp_dir: "/tmp/openshift-{{ 9999 | random }}" + vars_files: - vars.yml roles: @@ -51,5 +49,6 @@ oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", - oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}", + tmp_dir: "{{ tmp_dir }}" } diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 9da269888..73383da2c 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -1,4 +1,5 @@ --- + # tasks file for openshift_node - name: Install OpenShift yum: pkg=openshift-node state=installed @@ -8,13 +9,14 @@ command: /usr/bin/hostname {{ oo_bind_ip }} - 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@{{ oo_master_public_ips[0] }}:/var/lib/openshift/openshift.local.certificates/admin/ /tmp/openshift + local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' root@{{ oo_master_public_ips[0] }}:/var/lib/openshift/openshift.local.certificates/admin/ {{ tmp_dir }} ignore_errors: yes - file: path=/var/lib/openshift/openshift.local.certificates/admin state=directory +- file: path={{ tmp_dir }} 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' /tmp/openshift/ root@{{ oo_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin + local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' {{ tmp_dir }}/ root@{{ oo_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin ignore_errors: yes - name: Configure OpenShift Node settings @@ -36,3 +38,4 @@ - name: Enable OpenShift service: name=openshift-node enabled=yes state=started +- file: name={{ tmp_dir }} state=absent -- cgit v1.2.3 From 16ab19a24e6e2122f3f1b8f229b8bb20c88045cd Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Tue, 17 Feb 2015 10:07:09 -0700 Subject: * Use hostname module * Use mktemp for scratch directory --- playbooks/gce/openshift-node/config.yml | 7 +---- roles/openshift_node/files/sysconfig/kubeconfig | 40 ------------------------- roles/openshift_node/tasks/main.yml | 13 ++++---- 3 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 roles/openshift_node/files/sysconfig/kubeconfig (limited to 'playbooks/gce/openshift-node') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index 10016463b..c9cacbc63 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/playbooks/gce/openshift-node/config.yml @@ -34,10 +34,6 @@ hosts: oo_hosts_to_config connection: ssh user: root - - vars: - tmp_dir: "/tmp/openshift-{{ 9999 | random }}" - vars_files: - vars.yml roles: @@ -49,6 +45,5 @@ oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", - oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}", - tmp_dir: "{{ tmp_dir }}" + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" } diff --git a/roles/openshift_node/files/sysconfig/kubeconfig b/roles/openshift_node/files/sysconfig/kubeconfig deleted file mode 100644 index 81e660ae4..000000000 --- a/roles/openshift_node/files/sysconfig/kubeconfig +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - api-version: v1beta1 - server: http://cow.org:8080 - name: cow-cluster -- cluster: - certificate-authority: path/to/my/cafile - server: https://horse.org:4443 - name: horse-cluster -- cluster: - insecure-skip-tls-verify: true - server: https://pig.org:443 - name: pig-cluster -contexts: -- context: - cluster: horse-cluster - namespace: chisel-ns - user: green-user - name: federal-context -- context: - cluster: pig-cluster - namespace: saw-ns - user: black-user - name: queen-anne-context -current-context: federal-context -kind: Config -preferences: - colors: true -users: -- name: black-user - user: - auth-path: path/to/my/existing/.kubernetes_auth_file -- name: blue-user - user: - token: blue-token -- name: green-user - user: - client-certificate: path/to/my/client/cert - client-key: path/to/my/client/key diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 73383da2c..f1b2e9ac0 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -6,17 +6,20 @@ # fixme: Once openshift stops resolving hostnames for node queries remove this... - name: Set hostname to IP Addr (WORKAROUND) - command: /usr/bin/hostname {{ oo_bind_ip }} + hostname: name={{ oo_bind_ip }} + +- 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@{{ oo_master_public_ips[0] }}:/var/lib/openshift/openshift.local.certificates/admin/ {{ tmp_dir }} + local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' root@{{ oo_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 -- file: path={{ tmp_dir }} state=directory +- file: path={{ mktemp.stdout }} 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' {{ tmp_dir }}/ root@{{ oo_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin + local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' {{ mktemp.stdout }}/ root@{{ oo_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin ignore_errors: yes - name: Configure OpenShift Node settings @@ -38,4 +41,4 @@ - name: Enable OpenShift service: name=openshift-node enabled=yes state=started -- file: name={{ tmp_dir }} state=absent +- file: name={{ mktemp.stdout }} state=absent -- cgit v1.2.3