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

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