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

Merge branch 'master' into calico-cni-container-support

Browse source
This commit is contained in:
Matthew Mosesohn 2016-11-14 14:58:42 +03:00 committed by GitHub
commit 8092f57695
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/terraform/terraform.py
View file

@ -309,6 +309,7 @@ def openstack_host(resource, module_name):
attrs = { attrs = {
'access_ip_v4': raw_attrs['access_ip_v4'], 'access_ip_v4': raw_attrs['access_ip_v4'],
'access_ip_v6': raw_attrs['access_ip_v6'], 'access_ip_v6': raw_attrs['access_ip_v6'],
'ip': raw_attrs['network.0.fixed_ip_v4'],
'flavor': parse_dict(raw_attrs, 'flavor', 'flavor': parse_dict(raw_attrs, 'flavor',
sep='_'), sep='_'),
'id': raw_attrs['id'], 'id': raw_attrs['id'],

1
roles/dnsmasq/tasks/resolvconf.yml
View file

@ -3,6 +3,7 @@
shell: which resolvconf shell: which resolvconf
register: resolvconf register: resolvconf
ignore_errors: yes ignore_errors: yes
changed_when: false
- name: target resolv.conf file - name: target resolv.conf file
set_fact: set_fact:

2
roles/kubernetes/node/templates/kubelet.j2
View file

@ -14,7 +14,7 @@ KUBELET_ADDRESS="--address={{ ip | default("0.0.0.0") }}"
# The port for the info server to serve on # The port for the info server to serve on
# KUBELET_PORT="--port=10250" # KUBELET_PORT="--port=10250"
# You may leave this blank to use the actual hostname # You may leave this blank to use the actual hostname
KUBELET_HOSTNAME="--hostname-override={{ inventory_hostname }}" KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}"
{% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %} {% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %}
KUBELET_REGISTER_NODE="--register-node=false" KUBELET_REGISTER_NODE="--register-node=false"
{% endif %} {% endif %}

2
roles/kubernetes/preinstall/tasks/etchosts.yml
View file

@ -4,7 +4,7 @@
dest: /etc/hosts dest: /etc/hosts
block: |- block: |-
{% for item in groups['all'] -%} {% for item in groups['all'] -%}
{{ hostvars[item]['access_ip'] | default(hostvars[item]['ip'] | default(hostvars[item].ansible_default_ipv4.address)) }} {{ item }} {{ hostvars[item]['access_ip'] | default(hostvars[item]['ip'] | default(hostvars[item].ansible_default_ipv4.address)) }}{% if (item != hostvars[item]['ansible_hostname']) %} {{ hostvars[item]['ansible_hostname'] }}{% endif %} {{ item }}
{% endfor %} {% endfor %}
state: present state: present
create: yes create: yes