External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add all-in-one CI mode and make coreos test aio (#1665)

Browse Source
This commit is contained in:
Matthew Mosesohn
2017-09-15 22:28:37 +01:00
committed by GitHub
parent 8e731337ba
commit 0aab3c97a0
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cloud_playbooks/create-gce.yml
View File

@@ -15,6 +15,8 @@
instance_names: >-
{%- if mode in ['separate', 'separate-scale', 'ha', 'ha-scale'] -%}
k8s-{{test_name}}-1,k8s-{{test_name}}-2,k8s-{{test_name}}-3
{%- elif mode == 'aio' -%}
k8s-{{test_name}}-1
{%- else -%}
k8s-{{test_name}}-1,k8s-{{test_name}}-2
{%- endif -%}

18
tests/templates/inventory-gce.j2
View File

@@ -1,7 +1,9 @@
{% set node1 = gce.instance_data[0].name %}
{% set node2 = gce.instance_data[1].name %}
{{node1}} ansible_ssh_host={{gce.instance_data[0].public_ip}}
{% if mode != "aio" %}
{% set node2 = gce.instance_data[1].name %}
{{node2}} ansible_ssh_host={{gce.instance_data[1].public_ip}}
{% endif %}
{% if mode is defined and mode in ["ha", "ha-scale", "separate", "separate-scale"] %}
{% set node3 = gce.instance_data[2].name %}
{{node3}} ansible_ssh_host={{gce.instance_data[2].public_ip}}
@@ -35,7 +37,7 @@
{{node1}}
{{node2}}
{{node3}}
{% else %}
{% elif mode == "default" %}
[kube-master]
{{node1}}
@@ -45,6 +47,18 @@
[etcd]
{{node1}}
[vault]
{{node1}}
{% elif mode == "aio" %}
[kube-master]
{{node1}}
[kube-node]
{{node1}}
[etcd]
{{node1}}
[vault]
{{node1}}
{% endif %}