diff options
author | Andrew Butcher <abutcher@redhat.com> | 2018-01-19 15:33:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-19 15:33:11 -0500 |
commit | 7ad419c31b79c85d610143f95777040db4b5b1b7 (patch) | |
tree | 8bab1fd74d0a57b42934b4cfec82320ce3262d48 /playbooks/aws/openshift-cluster | |
parent | b7fa97a3762edccdaa68d6c33c22ef213d6893fe (diff) | |
parent | aab3108d87ceaff4933ac157f18909f12adba266 (diff) | |
download | openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.gz openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.bz2 openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.xz openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.zip |
Merge pull request #6691 from abutcher/oc-adm-csr-cn
Use master group's ansible_ssh_user when accepting nodes.
Diffstat (limited to 'playbooks/aws/openshift-cluster')
-rwxr-xr-x | playbooks/aws/openshift-cluster/accept.yml | 41 |
1 files changed, 5 insertions, 36 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 |