diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2018-01-10 15:07:01 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2018-01-16 16:11:02 -0500 |
| commit | aab3108d87ceaff4933ac157f18909f12adba266 (patch) | |
| tree | 806f3c2bec62326a049c6c999ea52b1f525ff274 | |
| parent | 0d59a0868971e7f038b775adef024a8f324ab010 (diff) | |
| download | openshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.gz openshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.bz2 openshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.xz openshift-aab3108d87ceaff4933ac157f18909f12adba266.zip | |
Remove duplication in node acceptance playbook and setup master groups so that we can use the first master's ansible_ssh_user when delegating.
| -rwxr-xr-x | playbooks/aws/openshift-cluster/accept.yml | 41 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/accept_nodes.yml | 4 |
2 files changed, 8 insertions, 37 deletions
diff --git a/playbooks/aws/openshift-cluster/accept.yml b/playbooks/aws/openshift-cluster/accept.yml index e7bed4f6e..46c453333 100755 --- a/playbooks/aws/openshift-cluster/accept.yml +++ b/playbooks/aws/openshift-cluster/accept.yml @@ -1,8 +1,7 @@ #!/usr/bin/ansible-playbook --- -- name: Setup the vpc and the master node group +- name: Accept nodes hosts: localhost - remote_user: root gather_facts: no tasks: - name: Alert user to variables needed - clusterid @@ -17,37 +16,7 @@ import_role: name: lib_openshift - - name: fetch masters - ec2_instance_facts: - region: "{{ openshift_aws_region | default('us-east-1') }}" - filters: - "tag:clusterid": "{{ openshift_aws_clusterid | default('default') }}" - "tag:host-type": master - instance-state-name: running - register: mastersout - retries: 20 - delay: 3 - until: "'instances' in mastersout and mastersout.instances|length > 0" - - - name: fetch new node instances - ec2_instance_facts: - region: "{{ openshift_aws_region | default('us-east-1') }}" - filters: - "tag:clusterid": "{{ openshift_aws_clusterid | default('default') }}" - "tag:host-type": node - instance-state-name: running - register: instancesout - retries: 20 - delay: 3 - until: "'instances' in instancesout and instancesout.instances|length > 0" - - - debug: - msg: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}" - - - name: approve nodes - oc_adm_csr: - #approve_all: True - nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}" - timeout: 60 - register: nodeout - delegate_to: "{{ mastersout.instances[0].public_ip_address }}" + - name: accept nodes + import_role: + name: openshift_aws + tasks_from: accept_nodes.yml diff --git a/roles/openshift_aws/tasks/accept_nodes.yml b/roles/openshift_aws/tasks/accept_nodes.yml index c2a2cea30..db30fe5c9 100644 --- a/roles/openshift_aws/tasks/accept_nodes.yml +++ b/roles/openshift_aws/tasks/accept_nodes.yml @@ -1,4 +1,6 @@ --- +- include_tasks: setup_master_group.yml + - name: fetch masters ec2_instance_facts: region: "{{ openshift_aws_region | default('us-east-1') }}" @@ -36,4 +38,4 @@ nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}" timeout: 60 register: nodeout - delegate_to: "{{ mastersout.instances[0].public_ip_address }}" + delegate_to: "{{ groups.masters.0 }}" |