C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use gce hostname as inventory name

Browse source 
Calico does not allow renaming hosts
This commit is contained in:
Matthew Mosesohn 2017-02-17 14:54:00 +03:00
parent 617edda9ba
commit a510e7b8f3
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -328,7 +328,6 @@ before_script:
CLUSTER_MODE: separate CLUSTER_MODE: separate
ETCD_DEPLOYMENT: rkt ETCD_DEPLOYMENT: rkt
KUBELET_DEPLOYMENT: rkt KUBELET_DEPLOYMENT: rkt
UPGRADE_TEST: "graceful"
.ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables .ubuntu_vault_sep_variables: &ubuntu_vault_sep_variables
# stage: deploy-gce-part1 # stage: deploy-gce-part1
@ -445,7 +444,7 @@ rhel7-weave-triggers:
when: on_success when: on_success
only: ['triggers'] only: ['triggers']
debian8-calico: debian8-calico-upgrade:
stage: deploy-gce-part2 stage: deploy-gce-part2
<<: *job <<: *job
<<: *gce <<: *gce

39
tests/templates/inventory-gce.j2
View file

@ -1,48 +1,51 @@
node1 ansible_ssh_host={{gce.instance_data[0].public_ip}} {% set node1 = gce.instance_data[0].name %}
node2 ansible_ssh_host={{gce.instance_data[1].public_ip}} {% set node2 = gce.instance_data[1].name %}
{{node1}} ansible_ssh_host={{gce.instance_data[0].public_ip}}
{{node2}} ansible_ssh_host={{gce.instance_data[1].public_ip}}
{% if mode is defined and mode in ["separate", "ha"] %} {% if mode is defined and mode in ["separate", "ha"] %}
node3 ansible_ssh_host={{gce.instance_data[2].public_ip}} {% set node3 = gce.instance_data[2].name %}
{{node3}} ansible_ssh_host={{gce.instance_data[2].public_ip}}
{% endif %} {% endif %}
{% if mode is defined and mode == "separate" %} {% if mode is defined and mode == "separate" %}
[kube-master] [kube-master]
node1 {{node1}}
[kube-node] [kube-node]
node2 {{node2}}
[etcd] [etcd]
node3 {{node3}}
[vault] [vault]
node3 {{node3}}
{% elif mode is defined and mode == "ha" %} {% elif mode is defined and mode == "ha" %}
[kube-master] [kube-master]
node1 {{node1}}
node2 {{node2}}
[kube-node] [kube-node]
node3 {{node3}}
[etcd] [etcd]
node2 {{node2}}
node3 {{node3}}
[vault] [vault]
node2 {{node2}}
node3 {{node3}}
{% else %} {% else %}
[kube-master] [kube-master]
node1 {{node1}}
[kube-node] [kube-node]
node2 {{node2}}
[etcd] [etcd]
node1 {{node1}}
[vault] [vault]
node1 {{node1}}
{% endif %} {% endif %}
[k8s-cluster:children] [k8s-cluster:children]