openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Host access fixes for Kubespray playbook run"

This commit is contained in:
Zuul 2017-11-21 21:16:33 +00:00 committed by Gerrit Code Review
parent 0c336132e5 03e8766905
commit 35c5e7a122
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraconfig/services/kubernetes-master.yaml
View File

@ -104,6 +104,7 @@ outputs:
{{ hostvars.raw_get(host)['ansible_hostname'] }}: {{ hostvars.raw_get(host)['ansible_hostname'] }}:
ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }} ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }}
ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }} ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }}
ansible_become: true
{% endfor %} {% endfor %}
kube-node: kube-node:
@ -113,6 +114,7 @@ outputs:
{{ hostvars.raw_get(host)['ansible_hostname'] }}: {{ hostvars.raw_get(host)['ansible_hostname'] }}:
ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }} ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }}
ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }} ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }}
ansible_become: true
{% endfor %} {% endfor %}
etcd: etcd:
@ -145,8 +147,8 @@ outputs:
{%- if kubespray_command is defined -%} {%- if kubespray_command is defined -%}
{{kubespray_command}} {{kubespray_command}}
{%- else -%} {%- else -%}
ANSIBLE_HOST_KEY_CHECKING=False
ansible-playbook ansible-playbook
-b
-i '{{playbook_dir}}/kubespray/inventory.yml' -i '{{playbook_dir}}/kubespray/inventory.yml'
--skip-tags docker,bastion-ssh-config --skip-tags docker,bastion-ssh-config
--extra-vars '@{{playbook_dir}}/kubespray/global_vars.yml' --extra-vars '@{{playbook_dir}}/kubespray/global_vars.yml'