openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add yml extension to kubespray inventory"

This commit is contained in:
Zuul 2017-11-16 20:27:19 +00:00 committed by Gerrit Code Review
parent 60f469640b dc621da47f
commit 37ab371ce5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ outputs:
- "{{playbook_dir}}/kubespray/artifacts"
- name: generate kubespray inventory
copy:
dest: "{{playbook_dir}}/kubespray/inventory"
dest: "{{playbook_dir}}/kubespray/inventory.yml"
content: |
kube-master:
hosts:
@ -135,7 +135,7 @@ outputs:
{%- else -%}
ansible-playbook
-b
-i '{{playbook_dir}}/kubespray/inventory'
-i '{{playbook_dir}}/kubespray/inventory.yml'
--skip-tags docker,bastion-ssh-config
--extra-vars '@{{playbook_dir}}/kubespray/global_vars.yml'
'{{playbook_dir}}/kubespray/playbook.yml'