diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-02-16 17:57:08 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-02-16 17:57:08 -0700 |
| commit | 90010f6db6294a99c56194afd89a0359a3d278dc (patch) | |
| tree | 100b4579e2484bc9c9bef9ee4be5bf9da1db5367 | |
| parent | 7d74d1913274cba4c4732cbc5f0a573cb99e5248 (diff) | |
| download | openshift-90010f6db6294a99c56194afd89a0359a3d278dc.tar.gz openshift-90010f6db6294a99c56194afd89a0359a3d278dc.tar.bz2 openshift-90010f6db6294a99c56194afd89a0359a3d278dc.tar.xz openshift-90010f6db6294a99c56194afd89a0359a3d278dc.zip | |
Update code to reflect review comments
| -rw-r--r-- | playbooks/gce/openshift-node/config.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 7 |
2 files changed, 12 insertions, 10 deletions
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 |