Skip to content

Commit

Permalink
small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jmgao1983 committed Dec 14, 2017
1 parent 2c8d59a commit f624541
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
## 可选 ------安装docker查询镜像 tag的小工具----
- name: 安装轻量JSON处理程序
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

- name: 安装轻量JSON处理程序
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

- name: 下载 docker-tag
Expand Down
10 changes: 5 additions & 5 deletions roles/lb/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#
- name: apt更新缓存刷新
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
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
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配置目录
file: name=/etc/haproxy state=directory
Expand All @@ -19,11 +19,11 @@

- name: 安装 keepalived using apt
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
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配置目录
file: name=/etc/keepalived state=directory
Expand Down

0 comments on commit f624541

Please sign in to comment.