增加依赖RPM包, 在最小OS环境下, 保证ansible仍能离线安装成功;rel-21.09

更新配置文件.

19 files changed, 9 insertions, 11 deletions

diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml
index 11d6228..d623e9f 100644
--- a/deploy_env/group_vars/all.yml
+++ b/deploy_env/group_vars/all.yml
@@ -5,6 +5,7 @@ wannat_global:
         redis_server_ip: "192.168.44.72"
         redis_server_port: 7002
         redis_index: 0
+        bifang_db_server_ip: "192.168.44.72"
         bifang_db_username: "root"
         bifang_db_password: "bifang!@#"
         bifang_radius_db_name: "tsg-bifang"
@@ -15,8 +16,8 @@ wannat_global:
         
     natgw:
         device: "eth0"
-        wannat_ip: "192.168.40.161"
-        wannat_port: 3545
+        wangw_ip: "192.168.40.161"
+        wangw_port: 3545
         natgw_bind_port: 3544
         layer2_gateway_device: "eth0"
         location_compare_type: 0
diff --git a/roles/natgw/templates/natgw.conf.j2 b/roles/natgw/templates/natgw.conf.j2
index a851d09..0516e88 100644
--- a/roles/natgw/templates/natgw.conf.j2
+++ b/roles/natgw/templates/natgw.conf.j2
@@ -22,8 +22,8 @@ config_type=1
 
 [NATGW_CONVERT]
 snat_mask_ip=192.168.50.147
-wannat_ip={{wannat_global.natgw.wannat_ip}}
-wannat_port={{wannat_global.natgw.wannat_port}}
+wannat_ip={{wannat_global.natgw.wangw_ip}}
+wannat_port={{wannat_global.natgw.wangw_port}}
 dnat_mask_ip=10.10.10.10
 natgw_bind_port={{wannat_global.natgw.natgw_bind_port}}
 device={{wannat_global.natgw.layer2_gateway_device}}
diff --git a/roles/radius_client/templates/radiusclient.conf.j2 b/roles/radius_client/templates/radiusclient.conf.j2
index 652a484..ff1a4d8 100644
--- a/roles/radius_client/templates/radiusclient.conf.j2
+++ b/roles/radius_client/templates/radiusclient.conf.j2
@@ -35,12 +35,12 @@ issue	/etc/radiusclient-ng/issue
 # no port is specified /etc/services is consulted of the radius
 # service. if this fails also a compiled in default is used.
 #authserver      localhost
-authserver 	{{wannat_global.common.redis_server_ip}}
+authserver 	{{wannat_global.radius.server_ip}}
 
 # RADIUS server to use for accouting requests. All that I
 # said for authserver applies, too. 
 #acctserver      localhost
-acctserver 	{{wannat_global.common.redis_server_ip}}
+acctserver 	{{wannat_global.radius.server_ip}}
 
 # file holding shared secrets used for the communication
 # between the RADIUS client and server
diff --git a/roles/radius_client/templates/servers.j2 b/roles/radius_client/templates/servers.j2
index 17ee53c..e970570 100644
--- a/roles/radius_client/templates/servers.j2
+++ b/roles/radius_client/templates/servers.j2
@@ -1,9 +1,6 @@
 #Server Name or Client/Server pair		Key		
 #----------------				---------------
-#portmaster.elemental.net			hardlyasecret
-#portmaster2.elemental.net	    		donttellanyonei
-#localhost  testing123
-{{wannat_global.common.redis_server_ip}}  testing123
+{{wannat_global.radius.server_ip}}  {{wannat_global.radius.shared_secret}}
 
 
 
diff --git a/roles/radius_server/templates/sql.j2 b/roles/radius_server/templates/sql.j2
index 4b3afc2..31cc124 100644
--- a/roles/radius_server/templates/sql.j2
+++ b/roles/radius_server/templates/sql.j2
@@ -89,7 +89,7 @@ sql {
 	# Connection info:
 	#
 	#server = "localhost"
-	server = "{{wannat_global.common.redis_server_ip}}"
+	server = "{{wannat_global.common.bifang_db_server_ip}}"
 	port = 3306
 	login = "{{wannat_global.common.bifang_db_username}}"
 	password = "{{wannat_global.common.bifang_db_password}}"
diff --git a/vendor/PyYAML-3.10-11.el7.x86_64.rpm b/vendor/PyYAML-3.10-11.el7.x86_64.rpm
new file mode 100644
index 0000000..6fe88a9
--- /dev/null
+++ b/vendor/PyYAML-3.10-11.el7.x86_64.rpm
diff --git a/vendor/libyaml-0.1.4-11.el7_0.x86_64.rpm b/vendor/libyaml-0.1.4-11.el7_0.x86_64.rpm
new file mode 100644
index 0000000..cb634d3
--- /dev/null
+++ b/vendor/libyaml-0.1.4-11.el7_0.x86_64.rpm
diff --git a/vendor/python-backports-1.0-8.el7.x86_64.rpm b/vendor/python-backports-1.0-8.el7.x86_64.rpm
new file mode 100644
index 0000000..a9afff2
--- /dev/null
+++ b/vendor/python-backports-1.0-8.el7.x86_64.rpm
diff --git a/vendor/python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm b/vendor/python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm
new file mode 100644
index 0000000..1ee4fc1
--- /dev/null
+++ b/vendor/python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm
diff --git a/vendor/python-cffi-1.6.0-5.el7.x86_64.rpm b/vendor/python-cffi-1.6.0-5.el7.x86_64.rpm
new file mode 100644
index 0000000..71b523a
--- /dev/null
+++ b/vendor/python-cffi-1.6.0-5.el7.x86_64.rpm
diff --git a/vendor/python-enum34-1.0.4-1.el7.noarch.rpm b/vendor/python-enum34-1.0.4-1.el7.noarch.rpm
new file mode 100644
index 0000000..4d3c89a
--- /dev/null
+++ b/vendor/python-enum34-1.0.4-1.el7.noarch.rpm
diff --git a/vendor/python-idna-2.4-1.el7.noarch.rpm b/vendor/python-idna-2.4-1.el7.noarch.rpm
new file mode 100644
index 0000000..de64244
--- /dev/null
+++ b/vendor/python-idna-2.4-1.el7.noarch.rpm
diff --git a/vendor/python-ipaddress-1.0.16-2.el7.noarch.rpm b/vendor/python-ipaddress-1.0.16-2.el7.noarch.rpm
new file mode 100644
index 0000000..d3c7d2b
--- /dev/null
+++ b/vendor/python-ipaddress-1.0.16-2.el7.noarch.rpm
diff --git a/vendor/python-ply-3.4-11.el7.noarch.rpm b/vendor/python-ply-3.4-11.el7.noarch.rpm
new file mode 100644
index 0000000..1b607e3
--- /dev/null
+++ b/vendor/python-ply-3.4-11.el7.noarch.rpm
diff --git a/vendor/python-pycparser-2.14-1.el7.noarch.rpm b/vendor/python-pycparser-2.14-1.el7.noarch.rpm
new file mode 100644
index 0000000..dd2e6c9
--- /dev/null
+++ b/vendor/python-pycparser-2.14-1.el7.noarch.rpm
diff --git a/vendor/python-setuptools-0.9.8-7.el7.noarch.rpm b/vendor/python-setuptools-0.9.8-7.el7.noarch.rpm
new file mode 100644
index 0000000..7fa9685
--- /dev/null
+++ b/vendor/python-setuptools-0.9.8-7.el7.noarch.rpm
diff --git a/vendor/python-six-1.9.0-2.el7.noarch.rpm b/vendor/python-six-1.9.0-2.el7.noarch.rpm
new file mode 100644
index 0000000..d6f3ca5
--- /dev/null
+++ b/vendor/python-six-1.9.0-2.el7.noarch.rpm
diff --git a/vendor/python2-cryptography-1.7.2-2.el7.x86_64.rpm b/vendor/python2-cryptography-1.7.2-2.el7.x86_64.rpm
new file mode 100644
index 0000000..97039ff
--- /dev/null
+++ b/vendor/python2-cryptography-1.7.2-2.el7.x86_64.rpm
diff --git a/vendor/python2-pyasn1-0.1.9-7.el7.noarch.rpm b/vendor/python2-pyasn1-0.1.9-7.el7.noarch.rpm
new file mode 100644
index 0000000..7c4351a
--- /dev/null
+++ b/vendor/python2-pyasn1-0.1.9-7.el7.noarch.rpm