From 2f3f9d023d418a51aa4f130e925946507ed9e2ed Mon Sep 17 00:00:00 2001 From: gjmzj Date: Sun, 6 May 2018 09:08:09 +0800 Subject: [PATCH] minor fix --- 99.clean.yml | 4 ++-- docs/02-安装etcd集群.md | 2 +- example/hosts.allinone.example | 2 +- example/hosts.m-masters.example | 2 +- example/hosts.s-master.example | 2 +- roles/prepare/tasks/main.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/99.clean.yml b/99.clean.yml index 855d6e0..08345b8 100644 --- a/99.clean.yml +++ b/99.clean.yml @@ -141,13 +141,13 @@ - name: 清理自动生成的PATH lineinfile: - dest: /etc/profile + dest: ~/.bashrc state: absent regexp: 'kubeasz' - name: 清理 kubectl 命令自动补全 lineinfile: - dest: /etc/profile + dest: ~/.bashrc state: absent regexp: 'kubectl completion' diff --git a/docs/02-安装etcd集群.md b/docs/02-安装etcd集群.md index 0f148bb..1fb056e 100644 --- a/docs/02-安装etcd集群.md +++ b/docs/02-安装etcd集群.md @@ -111,7 +111,7 @@ systemctl daemon-reload && systemctl enable etcd && systemctl start etcd # 根据hosts中配置设置shell变量 $NODE_IPS export NODE_IPS="192.168.1.1 192.168.1.2 192.168.1.3" $ for ip in ${NODE_IPS}; do - ETCDCTL_API=3 /root/local/bin/etcdctl \ + ETCDCTL_API=3 etcdctl \ --endpoints=https://${ip}:2379 \ --cacert=/etc/kubernetes/ssl/ca.pem \ --cert=/etc/etcd/ssl/etcd.pem \ diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example index a22279f..f3f01ab 100644 --- a/example/hosts.allinone.example +++ b/example/hosts.allinone.example @@ -76,7 +76,7 @@ BASIC_AUTH_PASS="test1234" # ---------附加参数-------------------- #默认二进制文件目录 -bin_dir="/root/local/bin" +bin_dir="/opt/kube/bin" #证书目录 ca_dir="/etc/kubernetes/ssl" diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example index bd1f8ec..a91cfa5 100644 --- a/example/hosts.m-masters.example +++ b/example/hosts.m-masters.example @@ -93,7 +93,7 @@ BASIC_AUTH_PASS="test1234" # ---------附加参数-------------------- #默认二进制文件目录 -bin_dir="/root/local/bin" +bin_dir="/opt/kube/bin" #证书目录 ca_dir="/etc/kubernetes/ssl" diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example index da3ec97..63f1fb9 100644 --- a/example/hosts.s-master.example +++ b/example/hosts.s-master.example @@ -80,7 +80,7 @@ BASIC_AUTH_PASS="test1234" # ---------附加参数-------------------- #默认二进制文件目录 -bin_dir="/root/local/bin" +bin_dir="/opt/kube/bin" #证书目录 ca_dir="/etc/kubernetes/ssl" diff --git a/roles/prepare/tasks/main.yml b/roles/prepare/tasks/main.yml index 0f9ac2c..2dcf27f 100644 --- a/roles/prepare/tasks/main.yml +++ b/roles/prepare/tasks/main.yml @@ -8,7 +8,7 @@ - name: 写入环境变量$PATH lineinfile: - dest: /etc/profile + dest: ~/.bashrc state: present regexp: 'kubeasz' line: 'export PATH={{ bin_dir }}:$PATH # generated by kubeasz' @@ -86,7 +86,7 @@ - name: 添加 kubectl 命令自动补全 lineinfile: - dest: /etc/profile + dest: ~/.bashrc state: present regexp: 'kubectl completion' line: 'source <(kubectl completion bash)'