minor fix

pull/29/head
jmgao 2017-12-14 23:47:16 +08:00
parent f62454199f
commit 0a343fb960
3 changed files with 7 additions and 7 deletions

View File

@ -2,7 +2,7 @@
### 1.准备一台虚机(推荐内存3G硬盘20G以上),最小化安装最新 CentOS7配置基础网络、更新源、SSH登陆等。
+ 关闭selinux: `echo SELINUX=disabled > /etc/selinux/config`
+ 关闭selinux: `setenforce 0 && echo SELINUX=disabled > /etc/selinux/config`
### 2.安装python2/git/python-pip/ansible
``` bash

View File

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

View File

@ -3,11 +3,11 @@
apt: update_cache=yes cache_valid_time=72000
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 haproxy using apt
- name: apt安装 haproxy using apt
apt: name=haproxy state=latest
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 haproxy using yum
- name: yum安装 haproxy using yum
yum: name=haproxy state=latest
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
@ -17,11 +17,11 @@
- name: 配置 haproxy
template: src=haproxy.cfg.j2 dest=/etc/haproxy/haproxy.cfg
- name: 安装 keepalived using apt
- name: apt安装 keepalived using apt
apt: name=keepalived state=latest
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
- name: 安装 keepalived using yum
- name: yum安装 keepalived using yum
yum: name=keepalived state=latest
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"