From 251704477734bc7775b83c44a8e3b6a76c9b43c4 Mon Sep 17 00:00:00 2001
From: liubo <liubo@pingcap.com>
Date: Thu, 23 Apr 2020 18:11:08 +0800
Subject: [PATCH] rename variable name 3.1 (#1285)

---
 roles/local/tasks/binary_deployment.yml      | 8 ++++----
 roles/local/tasks/main.yml                   | 4 ++--
 roles/local/templates/binary_packages.yml.j2 | 2 +-
 roles/pre-ansible/defaults/main.yml          | 2 +-
 roles/pre-ansible/tasks/coreos.yml           | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/local/tasks/binary_deployment.yml b/roles/local/tasks/binary_deployment.yml
index 71240765b..91257df3b 100644
--- a/roles/local/tasks/binary_deployment.yml
+++ b/roles/local/tasks/binary_deployment.yml
@@ -14,9 +14,9 @@
   with_items: "{{ third_party_packages }}"
   when:
     - has_outbound_network
-    - not under_gfw
+    - not under_outbound
 
-- name: download other binary under gfw
+- name: download other binary under outbound
   get_url:
     url: "{{ item.url }}"
     dest: "{{ downloads_dir }}/{{ item.name }}-{{ item.version }}.tar.gz"
@@ -27,10 +27,10 @@
   until: "'OK' in get_url_result.msg or 'file already exists' in get_url_result.msg"
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
-  with_items: "{{ third_party_packages_under_gfw }}"
+  with_items: "{{ third_party_packages_under_outbound }}"
   when:
     - has_outbound_network
-    - under_gfw
+    - under_outbound
 
 - name: download TiSpark packages
   get_url:
diff --git a/roles/local/tasks/main.yml b/roles/local/tasks/main.yml
index 19903f73a..9aaea0c98 100644
--- a/roles/local/tasks/main.yml
+++ b/roles/local/tasks/main.yml
@@ -47,10 +47,10 @@
     warn=no
     curl -s --connect-timeout 10 google.com 2>/dev/null >/dev/null; echo $?
   changed_when: false
-  register: gfw_st
+  register: outbound_st
 
 - name: set outbound network fact[2]
-  set_fact: under_gfw={{ gfw_st.stdout.strip() != '0' }}
+  set_fact: under_outbound={{ outbound_st.stdout.strip() != '0' }}
 
 # do actual downloading
 - name: download tidb binary
diff --git a/roles/local/templates/binary_packages.yml.j2 b/roles/local/templates/binary_packages.yml.j2
index 2f9dd362c..b426e6d06 100644
--- a/roles/local/templates/binary_packages.yml.j2
+++ b/roles/local/templates/binary_packages.yml.j2
@@ -21,7 +21,7 @@ third_party_packages:
     url: "https://dl.grafana.com/oss/release/grafana-6.1.6.linux-amd64.tar.gz"
 
 
-third_party_packages_under_gfw:
+third_party_packages_under_outbound:
   - name: prometheus
     version: 2.8.1
     url: "https://download.pingcap.org/prometheus-2.8.1.linux-amd64.tar.gz"
diff --git a/roles/pre-ansible/defaults/main.yml b/roles/pre-ansible/defaults/main.yml
index f677f6465..d93070219 100644
--- a/roles/pre-ansible/defaults/main.yml
+++ b/roles/pre-ansible/defaults/main.yml
@@ -12,4 +12,4 @@ pypy_version: 5.6.0
 pypy_download_url_base: "https://bitbucket.org/pypy/pypy/downloads"
 pypy_download_url: "{{ pypy_download_url_base }}/pypy2-v{{ pypy_version }}-linux64.tar.bz2"
 
-pypy_download_url_under_gfw: "http://download.pingcap.org/pypy2-v5.6.0-linux64.tar.bz2"
+pypy_download_url_under_outbound: "http://download.pingcap.org/pypy2-v5.6.0-linux64.tar.bz2"
diff --git a/roles/pre-ansible/tasks/coreos.yml b/roles/pre-ansible/tasks/coreos.yml
index c02879d6f..466c3af1b 100644
--- a/roles/pre-ansible/tasks/coreos.yml
+++ b/roles/pre-ansible/tasks/coreos.yml
@@ -15,14 +15,14 @@
 - name: CoreOS - detect outbound network[2]
   shell: curl -s --connect-timeout 2 google.com 2>/dev/null >/dev/null; echo $?
   changed_when: false
-  register: gfw_st
+  register: outbound_st
 
 - name: CoreOS - set outbound network fact[2]
-  set_fact: under_gfw={{ gfw_st.stdout.strip() != '0' }}
+  set_fact: under_outbound={{ outbound_st.stdout.strip() != '0' }}
 
 - name: CoreOS - use mirror if detect outbound network
   set_fact:
-    pypy_download_url: "{{ pypy_download_url_under_gfw }}"
+    pypy_download_url: "{{ pypy_download_url_under_outbound }}"
 
 - name: CoreOS | Create bootstrap directory
   shell: sudo mkdir -p {{ bootstrap_script_dir }}