From ea741b1796dfe3609b44b54f53b75ec82b4b1a49 Mon Sep 17 00:00:00 2001
From: Starmie <978965142@qq.com>
Date: Fri, 19 Feb 2021 21:33:36 +0800
Subject: [PATCH 1/4] -v: display more ansible logs
---
contrib/kubespray/quick-start-kubespray.sh | 16 ++++++++++++++++
contrib/kubespray/quick-start-service.sh | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/contrib/kubespray/quick-start-kubespray.sh b/contrib/kubespray/quick-start-kubespray.sh
index 1d15f7a72f..f5cc1df7ad 100644
--- a/contrib/kubespray/quick-start-kubespray.sh
+++ b/contrib/kubespray/quick-start-kubespray.sh
@@ -1,5 +1,21 @@
#!/bin/bash
+export ANSIBLE_DISPLAY_OK_HOSTS=no
+export DISPLAY_SKIPPED_HOSTS=no
+
+while getopts "v:" opt; do
+ case $opt in
+ v)
+ export ANSIBLE_DISPLAY_OK_HOSTS=yes
+ export DISPLAY_SKIPPED_HOSTS=yes
+ ;;
+ \?)
+ echo "Invalid option: -$OPTARG"
+ exit 1
+ ;;
+ esac
+done
+
# assume pwd is pai/contrib/kubespray
LAYOUT="$PWD/config/layout.yaml"
CLUSTER_CONFIG="$PWD/config/config.yaml"
diff --git a/contrib/kubespray/quick-start-service.sh b/contrib/kubespray/quick-start-service.sh
index e1344505d1..b714b3cd80 100644
--- a/contrib/kubespray/quick-start-service.sh
+++ b/contrib/kubespray/quick-start-service.sh
@@ -1,6 +1,22 @@
#!/bin/bash
set -e
+export ANSIBLE_DISPLAY_OK_HOSTS=no
+export DISPLAY_SKIPPED_HOSTS=no
+
+while getopts "v:" opt; do
+ case $opt in
+ v)
+ export ANSIBLE_DISPLAY_OK_HOSTS=yes
+ export DISPLAY_SKIPPED_HOSTS=yes
+ ;;
+ \?)
+ echo "Invalid option: -$OPTARG"
+ exit 1
+ ;;
+ esac
+done
+
# assume pwd is pai/contrib/kubespray
LAYOUT="$PWD/config/layout.yaml"
CLUSTER_CONFIG="$PWD/config/config.yaml"
From aad60ed0184352eedfe92aabc6bc06dd7d3af114 Mon Sep 17 00:00:00 2001
From: Starmie <978965142@qq.com>
Date: Mon, 22 Feb 2021 12:07:52 +0800
Subject: [PATCH 2/4] Introduced -v option in the installation doc
---
contrib/kubespray/quick-start-service.sh | 16 ----------------
docs/manual/cluster-admin/installation-guide.md | 6 ++++++
.../manual/cluster-admin/installation-guide.md | 6 ++++++
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/contrib/kubespray/quick-start-service.sh b/contrib/kubespray/quick-start-service.sh
index b714b3cd80..e1344505d1 100644
--- a/contrib/kubespray/quick-start-service.sh
+++ b/contrib/kubespray/quick-start-service.sh
@@ -1,22 +1,6 @@
#!/bin/bash
set -e
-export ANSIBLE_DISPLAY_OK_HOSTS=no
-export DISPLAY_SKIPPED_HOSTS=no
-
-while getopts "v:" opt; do
- case $opt in
- v)
- export ANSIBLE_DISPLAY_OK_HOSTS=yes
- export DISPLAY_SKIPPED_HOSTS=yes
- ;;
- \?)
- echo "Invalid option: -$OPTARG"
- exit 1
- ;;
- esac
-done
-
# assume pwd is pai/contrib/kubespray
LAYOUT="$PWD/config/layout.yaml"
CLUSTER_CONFIG="$PWD/config/config.yaml"
diff --git a/docs/manual/cluster-admin/installation-guide.md b/docs/manual/cluster-admin/installation-guide.md
index d3abdb8310..54d243e172 100644
--- a/docs/manual/cluster-admin/installation-guide.md
+++ b/docs/manual/cluster-admin/installation-guide.md
@@ -331,6 +331,12 @@ Please run the following script to deploy Kubernetes first. As the name explains
/bin/bash quick-start-kubespray.sh
```
+By default, ansible logs of `skip` and `ok` hosts are not displayed. To view more complete ansible logs, run the script in `verbose` mode:
+
+``` bash
+/bin/bash quick-start-kubespray.sh -v
+```
+
If there is any problem, please double-check the environment requirements first. Here we provide a requirement checker to help you verify:
``` bash
diff --git a/docs_zh_CN/manual/cluster-admin/installation-guide.md b/docs_zh_CN/manual/cluster-admin/installation-guide.md
index 3b22e403c8..1bb9dacc32 100644
--- a/docs_zh_CN/manual/cluster-admin/installation-guide.md
+++ b/docs_zh_CN/manual/cluster-admin/installation-guide.md
@@ -332,6 +332,12 @@ cd <pai-code-dir>/contrib/kubespray
/bin/bash quick-start-kubespray.sh
```
+安装过程中默认不显示`skip`和`ok`类型的ansible log。如需查看更完全的ansible log，请使用`verbose`模式：
+
+``` bash
+/bin/bash quick-start-kubespray.sh -v
+```
+
如果在安装过程中出现任何问题，请再次检查上述环境要求。我们也提供了一个脚本，帮助您进行检查：
``` bash
From 3550c2b7ca7337873c2647b658fbad61be2bfb12 Mon Sep 17 00:00:00 2001
From: Starmie <978965142@qq.com>
Date: Tue, 23 Feb 2021 12:50:35 +0800
Subject: [PATCH 3/4] If not in verbose mode, clear the callback whitelist
---
contrib/kubespray/quick-start-kubespray.sh | 11 ++++++-----
docs/manual/cluster-admin/installation-guide.md | 2 +-
docs_zh_CN/manual/cluster-admin/installation-guide.md | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/contrib/kubespray/quick-start-kubespray.sh b/contrib/kubespray/quick-start-kubespray.sh
index f5cc1df7ad..e63722d243 100644
--- a/contrib/kubespray/quick-start-kubespray.sh
+++ b/contrib/kubespray/quick-start-kubespray.sh
@@ -1,9 +1,6 @@
#!/bin/bash
-export ANSIBLE_DISPLAY_OK_HOSTS=no
-export DISPLAY_SKIPPED_HOSTS=no
-
-while getopts "v:" opt; do
+if getopts "v" opt; then
case $opt in
v)
export ANSIBLE_DISPLAY_OK_HOSTS=yes
@@ -14,7 +11,11 @@ while getopts "v:" opt; do
exit 1
;;
esac
-done
+else
+ export ANSIBLE_DISPLAY_OK_HOSTS=no
+ export DISPLAY_SKIPPED_HOSTS=no
+ export ANSIBLE_CALLBACK_WHITELIST=""
+fi
# assume pwd is pai/contrib/kubespray
LAYOUT="$PWD/config/layout.yaml"
diff --git a/docs/manual/cluster-admin/installation-guide.md b/docs/manual/cluster-admin/installation-guide.md
index 54d243e172..d982b2c07c 100644
--- a/docs/manual/cluster-admin/installation-guide.md
+++ b/docs/manual/cluster-admin/installation-guide.md
@@ -331,7 +331,7 @@ Please run the following script to deploy Kubernetes first. As the name explains
/bin/bash quick-start-kubespray.sh
```
-By default, ansible logs of `skip` and `ok` hosts are not displayed. To view more complete ansible logs, run the script in `verbose` mode:
+By default, ansible logs of `skip` and `ok` hosts are not displayed, and callback plugins are disabled. To view more complete or customized ansible logs, run the script in `verbose` mode:
``` bash
/bin/bash quick-start-kubespray.sh -v
diff --git a/docs_zh_CN/manual/cluster-admin/installation-guide.md b/docs_zh_CN/manual/cluster-admin/installation-guide.md
index 1bb9dacc32..5c31660077 100644
--- a/docs_zh_CN/manual/cluster-admin/installation-guide.md
+++ b/docs_zh_CN/manual/cluster-admin/installation-guide.md
@@ -332,7 +332,7 @@ cd <pai-code-dir>/contrib/kubespray
/bin/bash quick-start-kubespray.sh
```
-安装过程中默认不显示`skip`和`ok`类型的ansible log。如需查看更完全的ansible log，请使用`verbose`模式：
+安装过程中默认不显示`skip`和`ok`类型的ansible log，并且关闭所有callback插件。如需查看更完全的或自定义的ansible log，请使用`verbose`模式：
``` bash
/bin/bash quick-start-kubespray.sh -v
From 45c282fd315a8e73528243c2164b08dbdb049597 Mon Sep 17 00:00:00 2001
From: "Chengruidong Zhang (FA Talent)" <v-chenzhang@microsoft.com>
Date: Wed, 24 Feb 2021 15:13:17 +0800
Subject: [PATCH 4/4] In verbose mode, callback_whitelist = profile_tasks
---
contrib/kubespray/quick-start-kubespray.sh | 1 +
docs/manual/cluster-admin/installation-guide.md | 2 +-
docs_zh_CN/manual/cluster-admin/installation-guide.md | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/contrib/kubespray/quick-start-kubespray.sh b/contrib/kubespray/quick-start-kubespray.sh
index e63722d243..13087f8e0d 100644
--- a/contrib/kubespray/quick-start-kubespray.sh
+++ b/contrib/kubespray/quick-start-kubespray.sh
@@ -5,6 +5,7 @@ if getopts "v" opt; then
v)
export ANSIBLE_DISPLAY_OK_HOSTS=yes
export DISPLAY_SKIPPED_HOSTS=yes
+ export ANSIBLE_CALLBACK_WHITELIST="profile_tasks"
;;
\?)
echo "Invalid option: -$OPTARG"
diff --git a/docs/manual/cluster-admin/installation-guide.md b/docs/manual/cluster-admin/installation-guide.md
index d982b2c07c..54d243e172 100644
--- a/docs/manual/cluster-admin/installation-guide.md
+++ b/docs/manual/cluster-admin/installation-guide.md
@@ -331,7 +331,7 @@ Please run the following script to deploy Kubernetes first. As the name explains
/bin/bash quick-start-kubespray.sh
```
-By default, ansible logs of `skip` and `ok` hosts are not displayed, and callback plugins are disabled. To view more complete or customized ansible logs, run the script in `verbose` mode:
+By default, ansible logs of `skip` and `ok` hosts are not displayed. To view more complete ansible logs, run the script in `verbose` mode:
``` bash
/bin/bash quick-start-kubespray.sh -v
diff --git a/docs_zh_CN/manual/cluster-admin/installation-guide.md b/docs_zh_CN/manual/cluster-admin/installation-guide.md
index 5c31660077..1bb9dacc32 100644
--- a/docs_zh_CN/manual/cluster-admin/installation-guide.md
+++ b/docs_zh_CN/manual/cluster-admin/installation-guide.md
@@ -332,7 +332,7 @@ cd <pai-code-dir>/contrib/kubespray
/bin/bash quick-start-kubespray.sh
```
-安装过程中默认不显示`skip`和`ok`类型的ansible log，并且关闭所有callback插件。如需查看更完全的或自定义的ansible log，请使用`verbose`模式：
+安装过程中默认不显示`skip`和`ok`类型的ansible log。如需查看更完全的ansible log，请使用`verbose`模式：
``` bash
/bin/bash quick-start-kubespray.sh -v