Merge branch 'master' into tower_install

Conflicts:
	lib/aws_command.rb

4 files changed, 147 insertions, 0 deletions

diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
new file mode 100644
index 000000000..c9cacbc63
--- /dev/null
+++ b/playbooks/gce/openshift-node/config.yml
@@ -0,0 +1,49 @@
+- 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: "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..935599efd
--- /dev/null
+++ b/playbooks/gce/openshift-node/launch.yml
@@ -0,0 +1,57 @@
+---
+- 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
+
+# Always bounce service to pick up new credentials
+#- name: "Restart instances"
+#  hosts: oo_hosts_to_config
+#  connection: ssh
+#  user: root
+#  tasks:
+#    - debug: var=groups.oo_hosts_to_config
+#    - name: Restart OpenShift
+#      service: name=openshift-node enabled=yes state=restarted
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
--- /dev/null
+++ b/playbooks/gce/openshift-node/vars.yml