调整Ansible的结构，支持多环境部署。

.gitignore

@@ -0,0 +1,2 @@
+.vscode
+*.retry

deploy.yml

@@ -0,0 +1,25 @@
+- hosts: all
+  roles:
+    - kernel-ml
+    - framework
+
+- hosts: blade-00
+  roles:
+    - mrzcpd
+    - kni
+    - certstore
+
+- hosts: blade-01
+  roles:
+    - mrzcpd
+    - tfe
+
+- hosts: blade-02
+  roles:
+    - mrzcpd
+    - tfe
+
+- hosts: blade-03
+  roles:
+    - mrzcpd
+    - tfe

env-stage-hy/group_vars/all.yml

@@ -0,0 +1,41 @@
+maat_redis_server:
+    address: 192.168.100.3
+    port: 7002
+    db: 0
+
+cert_store_server:
+    address: 192.168.100.1
+    port: 9991
+
+log_kafkabrokers:
+    address: "192.168.100.4:9092"
+
+log_minio:
+    address: "192.168.100.4;"
+    port: 9000
+
+kni:
+    global:
+        log_level: 30
+        tfe_node_count: 3
+        tfe_data_recv_thread_num: 6
+        keepalive_replay_switch: 1
+    watch_dog:
+        switch: 1
+    maat:
+        readconf_mode: 2
+        default_action: 128
+    send_logger:
+        switch: 1
+    tfe_nodes:
+        - tfe0:
+              enabled: 1
+        - tfe1:
+              enabled: 1
+        - tfe2:
+              enabled: 1
+tfe:
+    nr_threads: 32
+    keykeeper:
+        mode: "debug"
+        no_cache: 0

env-stage-hy/group_vars/blade-00.yml

@@ -0,0 +1,13 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens1f4
+nic_inner_ctrl:
+    name: ens1.100
+nic_to_tfe:
+    tfe0:
+        name: ens1f5
+    tfe1:
+        name: ens1f6
+    tfe2:
+        name: ens1f7

env-stage-hy/group_vars/blade-01.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens1f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens1f2
+    use_mrzcpd: 1

env-stage-hy/group_vars/blade-02.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1

env-stage-hy/group_vars/blade-03.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1

env-stage-hy/hosts

@@ -0,0 +1,8 @@
+[all:vars]
+ansible_user=root
+
+[blade-00]
+192.168.10.41
+
+[blade-01]
+192.168.10.42

env-stage-xxg/group_vars/all.yml

@@ -0,0 +1,41 @@
+maat_redis_server:
+    address: 192.168.100.3
+    port: 7002
+    db: 0
+
+cert_store_server:
+    address: 192.168.40.161
+    port: 9991
+
+log_kafkabrokers:
+    address: "192.168.40.119:9092"
+
+log_minio:
+    address: "192.168.40.223;"
+    port: 9000
+
+kni:
+    global:
+        log_level: 30
+        tfe_node_count: 3
+        tfe_data_recv_thread_num: 6
+        keepalive_replay_switch: 1
+    watch_dog:
+        switch: 1
+    maat:
+        readconf_mode: 2
+        default_action: 128
+    send_logger:
+        switch: 1
+    tfe_nodes:
+        - tfe0:
+              enabled: 1
+        - tfe1:
+              enabled: 1
+        - tfe2:
+              enabled: 1
+tfe:
+    nr_threads: 32
+    keykeeper:
+        mode: "debug"
+        no_cache: 0

env-stage-xxg/group_vars/blade-00.yml

@@ -0,0 +1,13 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens1f4
+nic_inner_ctrl:
+    name: ens1.100
+nic_to_tfe:
+    tfe0:
+        name: ens1f5
+    tfe1:
+        name: ens1f6
+    tfe2:
+        name: ens1f7

env-stage-xxg/group_vars/blade-01.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens1f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens1f2
+    use_mrzcpd: 1

env-stage-xxg/group_vars/blade-02.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1

env-stage-xxg/group_vars/blade-03.yml

@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp7s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1

env-stage-xxg/hosts

@@ -0,0 +1,14 @@
+[all:vars]
+ansible_user=root
+
+[blade-00]
+192.168.40.161
+
+[blade-01]
+192.168.40.162
+
+[blade-02]
+192.168.40.163
+
+[blade-03]
+192.168.40.164

hosts.hy

@@ -0,0 +1,8 @@
+[all:vars]
+ansible_user=root
+
+[blade-00]
+192.168.10.41
+
+[blade-01]
+192.168.10.42

hosts.ycx

@@ -0,0 +1,8 @@
+[all:vars]
+ansible_user=root
+
+[blade-00]
+192.168.40.161
+
+[blade-01]
+192.168.40.162

roles/mrzcpd/tasks/main.yml

@@ -6,31 +6,40 @@
 
 - name: "install mrzcpd"
   yum:
-    name: "{{ packages }}"
+    name: /tmp/ansible_deploy/mrzcpd-4.3.14.79e262c-1.el7.x86_64.rpm
     state: present
-  vars:
-    packages:
-    - /tmp/ansible_deploy/mrzcpd-4.3.12.6ee1589-1.el7.x86_64.rpm
 
 - name: "update sysconfig/mrzcpd"
   template:
-    src: "{{ role_path }}/templates/mrzcpd.j2"
+    path: "{{ role_path }}/templates/mrzcpd.j2"
     dest: /etc/sysconfig/mrzcpd
 
 - name: "update mrglobal.conf - slave blade"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2"
+    path: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: nic_traffic_mirror is defined
 
 - name: "update mrglobal.conf - master blade"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.inline.j2"
+    path: "{{ role_path }}/templates/mrglobal.conf.inline.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: nic_traffic_mirror is not defined
 
 - name: "update mrtunnat.conf - master blade"
   template:
-    src: "{{ role_path }}/templates/mrtunnat.conf.inline.j2"
+    path: "{{ role_path }}/templates/mrtunnat.conf.inline.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: nic_traffic_mirror is not defined
+
+- name: "enable mrenv"
+  systemd:
+    name: mrenv
+    enabled: yes
+    daemon_reload: yes
+
+- name: "enable mrzcpd"
+  systemd:
+    name: mrzcpd
+    enabled: yes
+    daemon_reload: yes

roles/pulp-consumer/tasks/main.yml

@@ -0,0 +1,29 @@
+---
+- name: "Install EPEL"
+  yum:
+    name: http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+    state: present
+
+- name: "Install Pulp Consumer Tools Repo"
+  get_url:
+    url: https://repos.fedorapeople.org/repos/pulp/pulp/rhel-pulp.repo
+    dest: /etc/yum.repos.d/rhel-pulp.repo
+
+- name: "Install Pulp Consumer Tools"
+  yum:
+    name:
+      - pulp-admin-client
+      - pulp-rpm-admin-extensions
+      - pulp-consumer-client
+      - pulp-rpm-consumer-extensions
+      - pulp-agent
+      - pulp-rpm-handlers
+      - pulp-rpm-yumplugins
+      - python-gofer-qpid
+    state: present
+    update_cache: yes
+
+- name: "Start Pulp Message Service"
+  systemd:
+    state: started
+    name: goferd

roles/tfe/tasks/main.yml

@@ -11,30 +11,31 @@
   vars:
     packages:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.3.20190828-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.1.0.d94c397-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.1.1.48a5f7a-1.el7.x86_64.rpm
 
 - name: "template tfe-env config"
   template:
-    src: "{{ role_path }}/templates/tfe-env-config.j2"
+    path: "{{ role_path }}/templates/tfe-env-config.j2"
     dest: /etc/sysconfig/tfe-env-config
 
 - name: "template the tfe.conf"
   template:
-    src: "{{ role_path }}/templates/tfe.conf.j2"
-    dest: /home/tsg/tfe/conf/tfe/tfe.conf
+    path: "{{ role_path }}/templates/tfe.conf.j2"
+    dest: /opt/tsg/tfe/conf/tfe/tfe.conf
 
 - name: "template the pangu_pxy.conf"
   template:
-    src: "{{ role_path }}/templates/pangu_pxy.conf.j2"
-    dest: /home/tsg/tfe/conf/pangu/pangu_pxy.conf
-
-- name: "start tfe-kmod"
-  modprobe:
-    name: tfe_kmod
-    state: present
+    path: "{{ role_path }}/templates/pangu_pxy.conf.j2"
+    dest: /opt/tsg/tfe/conf/pangu/pangu_pxy.conf
 
 - name: "enable tfe-env"
   systemd:
     name: tfe-env
     enabled: yes
     daemon_reload: yes
+
+- name: "enable tfe"
+  systemd:
+    name: tfe
+    enable: yes
+    daemon_reload: yes

site.deploy.20190911.yml

@@ -0,0 +1,40 @@
+- hosts: blade-00
+  roles:
+    #    - mrzcpd
+    - framework
+    - kni
+  vars_files:
+    - "vars/common.yml"
+    - "vars/kni.yml"
+  vars:
+  - nic_mgr:
+      name: enp7s0
+  - nic_data_incoming:
+      name: ens1f4
+  - nic_inner_ctrl:
+      name: ens1.100
+  - nic_to_tfe:
+      tfe0:
+        name: ens1f5
+      tfe1: 
+        name: ens1f6
+      tfe2: 
+        name: ens1f7
+
+- hosts: blade-01
+  roles:
+    - framework
+      #- mrzcpd
+    - tfe
+  vars_files:
+    - "vars/common.yml"
+    - "vars/tfe.yml"
+  vars:
+  - nic_mgr:
+      name: enp7s0
+  - nic_data_incoming:
+      name: ens1f1
+      mac: AA:BB:CC:DD:EE:FF
+  - nic_traffic_mirror:
+      name: ens1f2
+      use_mrzcpd: 1

site.pulp.only.yml

@@ -0,0 +1,3 @@
+- hosts: blade-*
+  roles:
+    - pulp-consumer

tfe_clean_core_and_logs.yml

@@ -1,21 +0,0 @@
-- hosts: control-blade-all
-  tasks:
-  - name: "killall tfe"
-    command: "killall tfe"
-
-  - name: "find corefiles to delete"
-    find:
-      paths: /home/tsg/tfe/
-      patterns: core.*
-    register: corefiles_to_delete
-
-  - name: "cleanup coredump"
-    file:
-      state: absent
-      path: '{{ item.path }}'
-    with_items: "{{ corefiles_to_delete.files }}"
-  
-  - name: "cleanup RESTART.log"
-    file:
-      state: absent
-      path: /home/tsg/tfe/RESTART.log

vars/common.yml

@@ -1,12 +1,12 @@
 - maat_redis_server:
-    address: 10.4.35.1
-    port: 6379
+    address: 192.168.100.3
+    port: 7002
     db: 0
 - cert_store_server:
     address: 192.168.100.1
     port: 9991
 - log_kafkabrokers:
-    address: "10.4.37.7:9092,10.4.35.8:9092,10.4.35.9:9092"
+    address: "192.168.100.4:9092"
 - log_minio:
-    address: "10.4.35.1;"
+    address: "192.168.100.4;"
     port: 9000