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

small fix

pull/29/head
jmgao 2017-12-14 23:18:57 +08:00
parent 2c8d59abcd
commit f62454199f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/docker/tasks/main.yml
View File

@ -32,12 +32,12 @@
## 可选 ------安装docker查询镜像 tag的小工具---- ## 可选 ------安装docker查询镜像 tag的小工具----
- name: 安装轻量JSON处理程序 - name: 安装轻量JSON处理程序
apt: name=jq state=latest apt: name=jq state=latest
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version = "16" when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
tags: docker-tag tags: docker-tag
- name: 安装轻量JSON处理程序 - name: 安装轻量JSON处理程序
yum: name=jq state=latest yum: name=jq state=latest
when: ansible_distribution == "CentOS" and ansible_distribution_major_version = "7" when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
tags: docker-tag tags: docker-tag
- name: 下载 docker-tag - name: 下载 docker-tag

10
roles/lb/tasks/main.yml
View File

@ -1,15 +1,15 @@
# #
- name: apt更新缓存刷新 - name: apt更新缓存刷新
apt: update_cache=yes cache_valid_time=72000 apt: update_cache=yes cache_valid_time=72000
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version = "16" when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 haproxy using apt - name: 安装 haproxy using apt
apt: name=haproxy state=latest apt: name=haproxy state=latest
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version = "16" when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 haproxy using yum - name: 安装 haproxy using yum
yum: name=haproxy state=latest yum: name=haproxy state=latest
when: ansible_distribution == "CentOS" and ansible_distribution_major_version = "7" when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
- name: 创建haproxy配置目录 - name: 创建haproxy配置目录
file: name=/etc/haproxy state=directory file: name=/etc/haproxy state=directory
@ -19,11 +19,11 @@
- name: 安装 keepalived using apt - name: 安装 keepalived using apt
apt: name=keepalived state=latest apt: name=keepalived state=latest
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version = "16" when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 keepalived using yum - name: 安装 keepalived using yum
yum: name=keepalived state=latest yum: name=keepalived state=latest
when: ansible_distribution == "CentOS" and ansible_distribution_major_version = "7" when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
- name: 创建keepalived配置目录 - name: 创建keepalived配置目录
file: name=/etc/keepalived state=directory file: name=/etc/keepalived state=directory