regular update.

dockerFiles/jdk/entrypoint.sh

@@ -6,16 +6,24 @@ project_name=${project_name%-*}
 project_jar_file=$(ls ${project_base_dir}/${project_name}*.jar)
 
 if [ -n "${project_jar_file}" ];then
-    :
+    if [ -e "${project_jar_file}" ];then
+        :
+    else
+        echo "The jar_file:${project_jar_file} isn't exist."
+        exit 3
+    fi
 else
     echo "There isn't a jar file in the ${project_base_dir}."
     exit 2
 fi
 
-if [ -e "${project_jar_file}" ];then
-    echo "java ${JAVA_OPTS} -jar ${project_jar_file} ${project_run_opts}"
-    exec java ${JAVA_OPTS} -jar ${project_jar_file} ${project_run_opts}
+if [ -n "${JAVA_OPTS}" ];then
+    :
 else
-    echo "The jar_file:${project_jar_file} isn't exist."
-    exit 3
+    if [ -n "${CATALINA_OPTS}" ];then
+        JAVA_OPTS="${CATALINA_OPTS}"
+    fi
 fi
+
+echo "java ${JAVA_OPTS} -jar ${project_jar_file} ${project_run_opts}"
+exec java ${JAVA_OPTS} -jar ${project_jar_file} ${project_run_opts}

docker_install/defaults/main.yml

@@ -1,5 +1,5 @@
 
-docker_insecure_registry: 
+docker_insecure_registry: ""
 docker_data_dir: /data/apps/data/docker
 docker_install_method: local
 
@@ -16,7 +16,7 @@ docker_env_file: docker.sh
 docker_install_result:
   changed: False
 
-docker_install_version:
+docker_install_version: ""
 
 # docker args
 # cgroupfs or systemd

filebeat_install/defaults/main.yml

@@ -1,6 +1,6 @@
 app_base_dir: /data/apps/opt
 filebeat_run_user: root
-filebeat_packet:
+filebeat_packet: ""
 filebeat_install_dir: '{{app_base_dir}}'
 filebeat_app_name: filebeat
 filebeat_conf_dir: /data/apps/config/{{filebeat_app_name}}
@@ -16,7 +16,7 @@ filebeat_env_file: filebeat.sh
 
 # type: list
 filebeat_child_confs: []
-filebeat_old_child_conf:
+filebeat_old_child_conf: ""
 filebeat_old_child_confs: [ '{{filebeat_old_child_conf}}' ]
 filebeat_child_conf_dir: '{{filebeat_conf_dir}}/inputs.d'
 filebeat_modules_conf_dir: '{{filebeat_conf_dir}}/modules.d'

k8s_master_install/defaults/main.yml

@@ -5,13 +5,13 @@ k8s_conf_dir: /etc/kubernetes
 k8s_kubectl_cmd: '{{k8s_work_dir}}/kubectl'
 k8s_cfssl_cmd_path: '/usr/bin'
 # 这个变量是 k8s 加上 k8s 的版本指定的 如:/data/apps/opt/k8s_1.11.10, 暂时手动指定这个变量
-k8s_install_dir:
+k8s_install_dir: ""
 k8s_audit_log_dir: "/data/apps/log/kube-audit"
 k8s_apiserver_log_dir: "/data/apps/log/kube-apiserver" 
 k8s_controller_log_dir: "/data/apps/log/kube-controller-manager"
 k8s_scheduler_log_dir: "/data/apps/log/kube-scheduler"
 
-k8s_master_packet:
+k8s_master_packet: ""
 #k8s_master_dir_name: "{{lookup('pipe', 'tar tf '+ k8s_master_packet).split('\n')[-1].split(' ')[-1].split('/')| first}}"
 k8s_master_dir_name: "{{lookup('pipe', 'tar tf '+ k8s_master_packet).split('\n')[-1].split('/')| first}}"
 k8s_work_dir: /root/k8s
@@ -42,7 +42,9 @@ k8s_cert_o: "k8s"
 # tech. sa, dev
 k8s_cert_ou: "System"
 k8s_cert_conf_files: '{{q("fileglob", "templates/k8s_certs_json/*.json")}}'
-k8s_cert_hosts:
+k8s_cert_hosts: []
+# - 10.6.56.99
+# - 10.6.56.100
 
 
 k8s_master_confs:

k8s_master_install/handlers/main.yml

@@ -1,5 +1,6 @@
 - name: restart nginx service
   service: name=nginx state=reloaded
+
 - name: add to service list
   shell: '{{ item }}'
   with_items:

k8s_node_install/defaults/main.yml

@@ -5,18 +5,18 @@ k8s_conf_dir: /etc/kubernetes
 k8s_kubectl_cmd: '{{k8s_work_dir}}/kubectl'
 k8s_cfssl_cmd_path: '/usr/bin'
 # # 这个变量是 k8s 加上 k8s 的版本指定的 如:/data/apps/opt/k8s_1.11.10, 暂时手动指定这个变量
-k8s_install_dir:
+k8s_install_dir: ""
 
 # kubelet
 k8s_kubelet_root_dir: /data1/apps/data/kubelet
 k8s_kubelet_log_dir: /data/apps/log/kubelet
 
 k8s_proxy_log_dir: /data/apps/log/kube-proxy
 
-k8s_node_packet:
+k8s_node_packet: ""
 
 
-k8s_work_dir: /root/ningbo_bank/k8s
+k8s_work_dir: /root/k8s
 k8s_cert_json_dir: certs_json
 k8s_cert_dir: ansible_k8s_certs
 k8s_work_conf_dir: ansible_k8s_confs
@@ -53,4 +53,4 @@ k8s_system_RedHat_7_kernel_args:
   - name: 'fs.may_detach_mounts'
     value: 1
 
-k8s_system_RedHat_8_kernel_args: '{{k8s_system_RedHat_7_kernel_args[:3]}}'
+k8s_system_RedHat_8_kernel_args: '{{k8s_system_RedHat_7_kernel_args[:3]}}'

k8s_node_install/files/RedHat/7/k8s-ipvs.modules

@@ -6,9 +6,12 @@
 # xt_rpfilter
 ipvs_modules="ip_vs ip_vs_lc ip_vs_wlc ip_vs_rr ip_vs_wrr ip_vs_lblc ip_vs_lblcr ip_vs_dh ip_vs_sh ip_vs_nq ip_vs_sed ip_vs_ftp nf_conntrack_ipv4 ipt_rpfilter ipt_set sctp xt_sctp xt_set xt_u32 ipip"
 
-for kernel_module in ${ipvs_modules}; do
-    /sbin/modinfo -F filename ${kernel_module} > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-        /sbin/modprobe ${kernel_module}
-    fi
-done
+load_modules(){
+    for kernel_module in ${ipvs_modules}; do
+        /sbin/modinfo -F filename ${kernel_module} > /dev/null 2>&1
+        if [ $? -ne 0 ]; then
+            /sbin/modprobe ${kernel_module}
+        fi
+    done
+}
+load_modules

k8s_node_install/files/RedHat/8/k8s-ipvs.modules

@@ -6,9 +6,12 @@
 # xt_rpfilter
 ipvs_modules="ip_vs ip_vs_lc ip_vs_wlc ip_vs_rr ip_vs_wrr ip_vs_lblc ip_vs_lblcr ip_vs_dh ip_vs_sh ip_vs_nq ip_vs_sed ip_vs_ftp ipt_rpfilter ipt_set xt_sctp xt_set ipip"
 
-for kernel_module in ${ipvs_modules}; do
-    /sbin/modinfo -F filename ${kernel_module} > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-        /sbin/modprobe ${kernel_module}
-    fi
-done
+load_modules(){
+    for kernel_module in ${ipvs_modules}; do
+        /sbin/modinfo -F filename ${kernel_module} > /dev/null 2>&1
+        if [ $? -ne 0 ]; then
+            /sbin/modprobe ${kernel_module}
+        fi
+    done
+}
+load_modules

logstash_install/defaults/main.yml

@@ -12,7 +12,7 @@ logstash_install_dir: /data/apps/opt
 #logstash_install_dir: '{{app_base_dir}}'
 logstash_env_file: logstash.sh
 # type: list
-logstash_src_confs:
+logstash_src_confs: []
   #- 'jvm.options'
   #- 'logstash.yml'
   #- 'log4j2.properties'
@@ -21,7 +21,7 @@ logstash_boot_type: supervisor
 logstash_src_boot_conf: "{%if logstash_boot_type=='systemd'%}{{logstash_app_name}}.systemd{%else%}{{logstash_app_name}}.ini{%endif%}"
 
 # type: list
-logstash_src_pipeline_confs:
+logstash_src_pipeline_confs: []
 
 #logstash_src_pipeline_conf: 
 
@@ -30,6 +30,6 @@ logstash_is_multiple_pipeline: true
 
 # 下面这种数据的定义是不成立的，原因同 redis_install 中的一样,如果想在同一台机器上启动多个 logstash 进程，只能写多个 role ,每个role定义不同的变量来实现
 logstash_pipeline_instances:
-  - logstash_pipeline_conf:
-    logstash_pipeline_boot_conf:
-    logstash_pipeline_name: 
+  - logstash_pipeline_conf: ""
+    logstash_pipeline_boot_conf: ""
+    logstash_pipeline_name: ""

nacos_install/defaults/main.yml

@@ -1,5 +1,5 @@
 # 
-nacos_packet:
+nacos_packet: ""
 #nacos_packet_dir_name: "{{nacos_packet.replace('.tar.gz','') |basename}}"
 app_base_dir: /data/apps/opt
 nacos_app_name: nacos
@@ -32,14 +32,14 @@ nacos_data_source: database
 # true or false
 nacos_is_standalone: false
 nacos_use_mysql: true
-nacos_run_cmd: '{{nacos_base_dir}}/bin/startup.sh{%-if nacos_is_standalone%}
+nacos_run_cmd: "{{nacos_base_dir}}/bin/startup.sh{%-if nacos_is_standalone%}
  -m standalone
 {%-else-%}
 {%-if not nacos_use_mysql%}
  -p embedded
 {%-endif-%}
-{%-endif-%}
-'
+{%-endif-%}"
+
 # ExecStart={%raw%}{{nacos_base_dir}}/bin/startup.sh {%if nacos_run_mode == "standalone"%}-m standalone {%endif%}{%if nacos_data_source=="embedded"%}-p embedded{%endif%}{%endraw%}
 # supervisor or systemd
 nacos_service_type: systemd

python_venv/defaults/main.yml

@@ -1,9 +1,9 @@
 # deploy_project role vars
-project_install_dir:
+project_install_dir: ""
 project_k8s_work_dir: '{{project_install_dir}}'
 project_run_user: 'nobody'
 project_run_group: '{{project_run_user}}'
-project_prog_name:
+project_prog_name: ""
 project_workspace: "{{lookup('env', 'WORKSPACE') | default('./', true)}}"
 
 # this role vars 
@@ -26,7 +26,7 @@ project_venv_path_basename: "{{ project_venv_path_tmp_basename if project_venv_p
 # 当 project_venv_path 为 /opt/venv/mydjango/ 这种带 / 结尾的目录时, dirname 的结果是 /opt/venv/mydjango ,这不符合要求，需要进行再次 dirname
 
 project_venv_path_dirname: "{{ project_venv_path | dirname if project_venv_path_tmp_basename != '' else project_venv_path | dirname | dirname }}"
-project_venv_args:
+project_venv_args: ""
 
 # project_docker_work_dir 也得判断去 / ,要不软连接文件会有两个  /
 

redis_install/defaults/main.yml

@@ -3,7 +3,7 @@ app_base_dir: /data/apps/opt
 supervisor_prim_conf: /data/apps/config/supervisord/supervisord.conf
 
 
-redis_packet:
+redis_packet: ""
 
 redis_app_name: redis
 redis_install_dir: '{{app_base_dir}}'
@@ -20,7 +20,7 @@ redis_env_file: redis.sh
 redis_run_method: supervisor
 
 # sentinel
-redis_sentinel_conf:
+redis_sentinel_conf: ""
 
 redis_is_multi_instance: true
 redis_restart_with_notify: false

skywalking_install/defaults/main.yml

@@ -1,5 +1,5 @@
 # 
-sw_packet:
+sw_packet: ""
 #sw_packet_dir_name: "{{sw_packet.replace('.tar.gz','') |basename}}"
 app_base_dir: /data/apps/opt
 sw_app_name: skywalking

system_init/defaults/main.yml

@@ -1,6 +1,6 @@
 
 system_dns_conf: resolv.conf
-system_dns_servers:
+system_dns_servers: ""
 
 system_is_hadoop: false
 system_ntp_servers: []

tomcat_install/defaults/main.yml

@@ -8,7 +8,7 @@ tomcat_run_user: 'tomcat'
 tomcat_run_group: '{{tomcat_run_user}}'
 tomcat_base_name: tomcat
 
-tomcat_packet:
+tomcat_packet: ""
 # tgz or jar
 tomcat_packet_type: tgz
 tomcat_base_dir: /data/apps/opt/{{tomcat_base_name}}
@@ -17,7 +17,7 @@ tomcat_conf_dir: /data/apps/opt/{{tomcat_base_name}}/conf
 
 tomcat_conf_files: []
 tomcat_script_files: []
-tomcat_port:  
+tomcat_port: 8080
 # 项目启动的方式, 目前可选择 supervisor
 tomcat_boot_type: supervisor
 tomcat_boot_file: 'tomcat.{{tomcat_boot_type}}'

zookeeper_install/defaults/main.yml

@@ -3,7 +3,7 @@ zookeeper_run_user: zookeeper
 zookeeper_run_group: '{{zookeeper_run_user}}'
 zookeeper_base_name: zookeeper
 zookeeper_app_name: zookeeper
-zookeeper_packet:
+zookeeper_packet: ""
 
 # tgz or jar
 zookeeper_packet_type: tgz
@@ -14,7 +14,7 @@ zookeeper_log_dir: /data/apps/log/{{zookeeper_base_name}}
 zookeeper_conf_dir: /data/apps/config/{{zookeeper_base_name}}
 zookeeper_data_dir: '/data/apps/data/{{zookeeper_base_name}}'
 
-zookeeper_conf_file:
+zookeeper_conf_file: ""
 zookeeper_conf_files:
   - 'java.env'
   - 'zoo.cfg'