新增从pulp拉取rpm

conf/yum.conf

@@ -53,3 +53,51 @@ enabled=1
 gpgcheck=1
 gpgkey=https://download.docker.com/linux/centos/gpg
 
+
+[framework]
+name=framework
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/framework/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+
+[platform]
+name=platform
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/platform/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+
+[protocol]
+name=protocol
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/protocol/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+
+[tsg]
+name=tsg
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/tsg/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+
+[AppSktech]
+name=AppSketch
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/AppSketch/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+
+[tfe]
+name=tfe
+baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/tfe/
+enabled=1
+gpgcheck=0
+username=tsg-os-installer
+password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO

tsg-9140-scripts/install_config/group_vars/rpm_version.yml

@@ -0,0 +1,61 @@
+certstore_rpm_version: certstore-2.1.7.20210422.3f0c7ed
+
+firewall_rpm_version:
+  capture_packet_plug: capture_packet_plug-3.0.6.a2db4a4
+  conn_telemetry: conn_telemetry-1.0.2.8d6da43
+  dns: dns-2.0.11.2265b5c
+  ftp: ftp-1.0.8.13d5fda
+  fw_dns_plug: fw_dns_plug-3.0.5.2a25c20
+  fw_ftp_plug: fw_ftp_plug-3.0.1.0a78573
+  fw_http_plug: fw_http_plug-3.1.11.b0f7b8f
+  fw_mail_plug: fw_mail_plug-3.0.9.d496513
+  fw_quic_plug: fw_quic_plug-3.0.4.947ef77
+  fw_ssl_plug: fw_ssl_plug-3.0.6.a121701
+  http: http-2.0.5.c61ad9a
+  mail: mail-1.0.9.c1d3bde
+  quic: quic-1.1.17.8c22b4d
+  ssl: ssl-1.0.12.16b8fb5
+  tsg_conn_sketch: tsg_conn_sketch-2.1.16.7b1b2d5
+  rtp: rtp-1.0.4.91b4ab7
+  mesa_sip: mesa_sip-1.0.15.77d2f1a
+  fw_voip_plug: fw_voip_plug-1.0.6.341fe83
+  app_proto_identify: app_proto_identify-1.0.10.1eeff1d
+
+framework_rpm_version:
+  libcjson: libcjson-1.7.10.ab2896f
+  libdocumentanalyze: libdocumentanalyze-2.0.6.2d1abe0
+  libmaatframe: libmaatframe-3.1.19.66c294f
+  libMESA_field_stat: libMESA_field_stat-1.0.2.6d45eed
+  libMESA_field_stat2: libMESA_field_stat2-2.9.10.72ac4f1
+  libMESA_handle_logger: libMESA_handle_logger-2.0.7.cb4ad71
+  libMESA_htable: libMESA_htable-3.10.12.cf4ccfc
+  libMESA_prof_load: libMESA_prof_load-1.0.6.c6da36a
+  librdkafka: /tmp/ansible_deploy/librdkafka-0.11.4-1.el7.x86_64.rpm
+  librulescan: librulescan-2.2.2.e5a4457
+  libtsglua: libtsglua-1.0.8.0dbf2e6
+  libwiredcfg: libwiredcfg-2.0.6.67ae0ab
+  libWiredLB: libWiredLB-2.0.5.4629165
+  lz4: /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
+  libbreakpad_mini: libbreakpad_mini-1.0.2.a56ef00
+  libaws-c-common: libaws-c-common-1.0.3.fa2adf0
+  libaws-c-event-stream: libaws-c-event-stream-1.0.6.67fd944
+  libaws-checksums: libaws-checksums-1.0.6.8b09ac1
+  libaws-cpp-sdk-core: libaws-cpp-sdk-core-1.0.8.a3fe079
+  libaws-cpp-sdk-s3: libaws-cpp-sdk-s3-2.0.0.f3c33ea
+  libhos-client-cpp: libhos-client-cpp-1.0.24.20e6f94
+
+kni_rpm_version: kni-21.03.01.916999f
+
+mrzcpd_rpm_version: mrzcpd-4.3.30.4627eb7
+
+sapp_rpm_version:
+  sapp: sapp-4.2.32.91bc8e3
+  tcpdump_mesa: tcpdump_mesa-1.0.4.4ef2936
+
+tfe_rpm_version: tfe-4.4.01.3e020b9
+
+tsg_app_rpm_version: app_sketch_local-2.0.5.ff1622f
+  
+tsg_master_rpm_version: tsg_master-3.4.12.441b0d1
+
+tsg_diagnose_rpm_version: tsg-diagnose-21.03.01.39beba7

tsg-9140-scripts/roles/certstore/tasks/main.yml

@@ -10,7 +10,7 @@
 - name: install certstore
   yum:
     name:
-      - /tmp/ansible_deploy/certstore-2.1.6.20201215.f2e9ba7-1.el7.x86_64.rpm
+      - "{{ certstore_rpm_version }}"
     state: present
 
 - name: template certstore configure file
@@ -28,5 +28,3 @@
     src: "{{ role_path }}/files/memory.conf"
     dest: /etc/systemd/system/certstore.service.d/
     mode: 0644
-
-

tsg-9140-scripts/roles/firewall/tasks/main.yml

@@ -6,30 +6,10 @@
 
 - name: "install firewall packages"
   yum:
-    name: "{{ fw_packages }}"
+    name: "{{ item.value }}"
     state: present
     skip_broken: yes
-  vars:
-    fw_packages:
-      - /tmp/ansible_deploy/capture_packet_plug-3.0.6.a2db4a4-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dns-2.0.11.2265b5c-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_dns_plug-3.0.2.dab58fa-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ftp_plug-3.0.1.0a78573-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_http_plug-3.1.5.69f6482-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_mail_plug-3.0.2.7401550-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/mail-1.0.9.c1d3bde-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.4.f333054-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/mesa_sip-1.0.9.ede6893-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_voip_plug-1.0.2.090e5da-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_proto_identify-1.0.9.a6581a6-2.el7.x86_64.rpm
+  with_dict: "{{ firewall_rpm_version }}"
 
 - name: "Template the tsgconf/main.conf"
   template:

tsg-9140-scripts/roles/framework/tasks/main.yml

@@ -5,32 +5,10 @@
 
 - name: "install framework packages"
   yum:
-    name: "{{ packages }}"
+    name: "{{ item.value }}"
     state: present
     skip_broken: yes
-  vars:
-    packages:
-      - /tmp/ansible_deploy/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.1.14.673eeb9-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/librdkafka-0.11.4-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/librulescan-2.2.2.e5a4457-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libtsglua-1.0.8.0dbf2e6-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libaws-c-common-1.0.3.fa2adf0-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libaws-c-event-stream-1.0.6.67fd944-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libaws-checksums-1.0.6.8b09ac1-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libaws-cpp-sdk-core-1.0.8.a3fe079-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libaws-cpp-sdk-s3-2.0.0.f3c33ea-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libhos-client-cpp-1.0.24.20e6f94-2.el7.x86_64.rpm  
+  with_dict: "{{ framework_rpm_version }}"
 
 - name: "mkdir /etc/ld.so.conf.d/"
   file:

tsg-9140-scripts/roles/kni/tasks/main.yml

@@ -7,7 +7,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-21.03.03.3cd5031-2.el7.x86_64.rpm
+      - "{{ kni_rpm_version }}"
     state: present
 #    skip_broken: yes
 

tsg-9140-scripts/roles/mrzcpd/tasks/main.yml

@@ -6,7 +6,7 @@
 
 - name: "install mrzcpd"
   yum:
-    name: /tmp/ansible_deploy/mrzcpd-4.4.0.21fa879-1.el7.x86_64.rpm
+    name: "{{ mrzcpd_rpm_version }}"
     state: present
 
 - name: "update sysconfig/mrzcpd"

tsg-9140-scripts/roles/sapp/tasks/main.yml

@@ -10,18 +10,11 @@
     dest: /usr/local/bin
     mode: 0755
 
-- name: "install sapp rpms from localhost"
+- name: "install sapp and tcpdump_mesa rpms from localhost"
   yum:
-    name:
-      - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
+    name: "{{ item.value }}"
     state: present
-
-- name: "install tcpdump_mesa rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm
-    state: present
-    skip_broken: yes
+  with_dict: "{{ sapp_rpm_version }}"
 
 - name: "mkdir tsgconf"
   file:

tsg-9140-scripts/roles/tfe/tasks/main.yml

@@ -14,7 +14,7 @@
   yum:
     name:
       #- /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.30.62dde9e-1.el7.x86_64.rpm
+      - "{{ tfe_rpm_version }}"
     state: present
 
 - name: "tfe:copy cert file to device"

tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml

@@ -6,7 +6,7 @@
 - name: "Install tsg-diagnose rpm package"
   yum:
     name:
-      - "/tmp/ansible_deploy/tsg-diagnose-21.03.01.39beba7-1.el7.x86_64.rpm"
+      - "{{ tsg_diagnose_rpm_version }}"
     state: present
 
 - name: "Templates tsg-diagnose.config"
@@ -25,7 +25,4 @@
   unarchive:
     src: /tmp/ansible_deploy/tsg-diagnose-certs.tgz
     dest: /opt/tsg/tsg-diagnose/.badssl_cert_dict
-    remote_src: yes
-
-- name: "tsg-diagnose init rsync deamon"
-  shell: /bin/sh /opt/tsg/tsg-diagnose/deploy/rsync/init_rsyncd.sh
+    remote_src: yes

tsg-9140-scripts/roles/tsg_app/tasks/main.yml

@@ -6,11 +6,8 @@
 
 - name: "install tsg_app packages"
   yum:
-    name: "{{ app_packages }}"
+    name: "{{ tsg_app_rpm_version }}"
     state: present
     skip_broken: yes
-  vars:
-    app_packages:
-      - /tmp/ansible_deploy/app_sketch_local-2.0.2.edf4fb0-2.el7.x86_64.rpm
 #  when: tsg_app_enable == 1
 

tsg-9140-scripts/roles/tsg_master/tasks/main.yml

@@ -6,6 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-3.4.6.3851946-2.el7.x86_64.rpm
+      - "{{ tsg_master_rpm_version }}"
     state: present
     skip_broken: yes

tsg-9140-scripts/tsg_9140_deploy.yml

@@ -2,6 +2,7 @@
   remote_user: root
   vars_files:
     - install_config/group_vars/tsg_9140_docker.yml
+    - install_config/group_vars/rpm_version.yml
   roles:
     #- {role: init-env, tags: init-env}
     - {role: init_runtime, tags: init_runtime}