easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix

pull/164/head
gjmzj 2018-04-10 18:06:12 +08:00
parent cfa377db76
commit b176a8761d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kube-node/templates/kubelet.service.j2
View File

@ -9,6 +9,8 @@ WorkingDirectory=/var/lib/kubelet
#--pod-infra-container-image=registry.access.redhat.com/rhel7/pod-infrastructure:latest #--pod-infra-container-image=registry.access.redhat.com/rhel7/pod-infrastructure:latest
ExecStart={{ bin_dir }}/kubelet \ ExecStart={{ bin_dir }}/kubelet \
--address={{ NODE_IP }} \ --address={{ NODE_IP }} \
--authentication-token-webhook=true \
--authorization-mode=Webhook \
--hostname-override={{ NODE_IP }} \ --hostname-override={{ NODE_IP }} \
--pod-infra-container-image=mirrorgooglecontainers/pause-amd64:3.0 \ --pod-infra-container-image=mirrorgooglecontainers/pause-amd64:3.0 \
--experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig \ --experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig \

2
roles/lb/templates/keepalived-backup.conf.j2
View File

@ -10,6 +10,6 @@ vrrp_instance VI-kube-master {
virtual_router_id {{ ROUTER_ID }} virtual_router_id {{ ROUTER_ID }}
advert_int 3 advert_int 3
virtual_ipaddress { virtual_ipaddress {
{{ MASTER_IP }}/24 {{ MASTER_IP }}
} }
} }

2
roles/lb/templates/keepalived-master.conf.j2
View File

@ -19,6 +19,6 @@ vrrp_instance VI-kube-master {
check-haproxy check-haproxy
} }
virtual_ipaddress { virtual_ipaddress {
{{ MASTER_IP }}/24 {{ MASTER_IP }}
} }
} }

1
roles/prepare/tasks/main.yml
View File

@ -53,6 +53,7 @@
- socat # 用于port forwarding - socat # 用于port forwarding
- nfs-common # 挂载nfs 共享文件需要 (创建基于 nfs的PV 需要) - nfs-common # 挂载nfs 共享文件需要 (创建基于 nfs的PV 需要)
- conntrack # network connection cleanup 用到 - conntrack # network connection cleanup 用到
- bash-completion
- block: - block:
- name: 删除centos默认安装 - name: 删除centos默认安装