From 0dae109a0c71c377e4b7915d5bb424455fc4cf42 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 18 Jun 2021 16:33:03 +0800 Subject: [PATCH] =?UTF-8?q?7400=20adapt:=E8=B0=83=E6=95=B4mrzcpd=E4=B8=AD?= =?UTF-8?q?=E4=B8=8Emrglobal.conf=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97=E5=92=8C=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/mrzcpd/tasks/main.yml | 6 +++--- ...bal.conf.mcn123.j2 => mrglobal.conf.j2.7400MCN123P01R01} | 0 ...l.conf.mcn0.j2.j2 => mrglobal.conf.j2.j2.7400MCN0P01R01} | 0 ...rglobal.conf.j2.j2 => mrglobal.conf.j2.j2.9000NPBP01R01} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename ansible/roles/mrzcpd/templates/{tsg_7400/mrglobal.conf.mcn123.j2 => mrglobal.conf.j2.7400MCN123P01R01} (100%) rename ansible/roles/mrzcpd/templates/{tsg_7400/mrglobal.conf.mcn0.j2.j2 => mrglobal.conf.j2.j2.7400MCN0P01R01} (100%) rename ansible/roles/mrzcpd/templates/{tsg_9140/mrglobal.conf.j2.j2 => mrglobal.conf.j2.j2.9000NPBP01R01} (100%) diff --git a/ansible/roles/mrzcpd/tasks/main.yml b/ansible/roles/mrzcpd/tasks/main.yml index fa77bec8..6b71c1f3 100644 --- a/ansible/roles/mrzcpd/tasks/main.yml +++ b/ansible/roles/mrzcpd/tasks/main.yml @@ -12,21 +12,21 @@ - name: "update mrglobal.conf - TSG9140" template: - src: "{{ role_path }}/templates/tsg_9140/mrglobal.conf.j2.j2" + src: "{{ role_path }}/templates/mrglobal.conf.j2.j2.9000NPBP01R01" dest: /opt/tsg/tsg-os-provision/templates/mrglobal.conf.j2 when: - PROFILE_ID == '9000-NPB-P01R01' - name: "update mrglobal.conf - TSG7400 - mcn0" template: - src: "{{ role_path }}/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2" + src: "{{ role_path }}/templates/mrglobal.conf.j2.j2.7400MCN0P01R01" dest: /opt/tsg/tsg-os-provision/templates/mrglobal.conf.j2 when: - PROFILE_ID == '7400-MCN0-P01R01' - name: "update mrglobal.conf - TSG7400 - mcn1 mcn2 mcn3" template: - src: "{{ role_path }}/templates/tsg_7400/mrglobal.conf.mcn123.j2" + src: "{{ role_path }}/templates/tsg_7400/mrglobal.conf.j2.7400MCN123P01R01" dest: /opt/mrzcpd/etc/mrglobal.conf when: - PROFILE_ID == '7400-MCN123-P01R01' diff --git a/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn123.j2 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.7400MCN123P01R01 similarity index 100% rename from ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn123.j2 rename to ansible/roles/mrzcpd/templates/mrglobal.conf.j2.7400MCN123P01R01 diff --git a/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 similarity index 100% rename from ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 rename to ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 diff --git a/ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.j2.j2 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 similarity index 100% rename from ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.j2.j2 rename to ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01