From 4b0608824c99bb8b1e7803169458d7e852a919da Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 18 Jun 2021 16:45:23 +0800 Subject: [PATCH] =?UTF-8?q?7400=20adapt:=E8=B0=83=E6=95=B4sapp=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=E5=92=8C=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/sapp/tasks/main.yml | 16 ++++++++-------- ...mmetric_presence_layer.conf.j2.9000NPBP01R01} | 0 ...ric_presence_layer.conf.j2.j2.7400MCN0P01R01} | 0 ...list.inf.j2 => conflist.inf.j2.9000NPBP01R01} | 0 ...f.j2.j2 => conflist.inf.j2.j2.7400MCN0P01R01} | 0 ...=> necessary_plug_list.conf.j2.9000NPBP01R01} | 0 ...ecessary_plug_list.conf.j2.j2.7400MCN0P01R01} | 0 ...2 => vlan_flipping_map.conf.j2.9000NPBP01R01} | 0 ... vlan_flipping_map.conf.j2.j2.7400MCN0P01R01} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename ansible/roles/sapp/templates/{tsg_9140/asymmetric_presence_layer.conf.j2 => asymmetric_presence_layer.conf.j2.9000NPBP01R01} (100%) rename ansible/roles/sapp/templates/{tsg_7400/asymmetric_presence_layer.conf.j2.j2 => asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01} (100%) rename ansible/roles/sapp/templates/{tsg_9140/conflist.inf.j2 => conflist.inf.j2.9000NPBP01R01} (100%) rename ansible/roles/sapp/templates/{tsg_7400/conflist.inf.j2.j2 => conflist.inf.j2.j2.7400MCN0P01R01} (100%) rename ansible/roles/sapp/templates/{tsg_9140/necessary_plug_list.conf.j2 => necessary_plug_list.conf.j2.9000NPBP01R01} (100%) rename ansible/roles/sapp/templates/{tsg_7400/necessary_plug_list.conf.j2.j2 => necessary_plug_list.conf.j2.j2.7400MCN0P01R01} (100%) rename ansible/roles/sapp/templates/{tsg_9140/vlan_flipping_map.conf.j2 => vlan_flipping_map.conf.j2.9000NPBP01R01} (100%) rename ansible/roles/sapp/templates/{tsg_7400/vlan_flipping_map.conf.j2.j2 => vlan_flipping_map.conf.j2.j2.7400MCN0P01R01} (100%) diff --git a/ansible/roles/sapp/tasks/main.yml b/ansible/roles/sapp/tasks/main.yml index dc84a846..1e5ac4ec 100644 --- a/ansible/roles/sapp/tasks/main.yml +++ b/ansible/roles/sapp/tasks/main.yml @@ -30,7 +30,7 @@ - name: Template the conflist.inf - tsg_9140 template: - src: "{{ role_path }}/templates/tsg_9140/conflist.inf.j2" + src: "{{ role_path }}/templates/conflist.inf.j2.9000NPBP01R01" dest: /home/mesasoft/sapp_run/plug/conflist.inf tags: template when: @@ -38,7 +38,7 @@ - name: Template the conflist.inf - tsg_7400 template: - src: "{{ role_path }}/templates/tsg_7400/conflist.inf.j2.j2" + src: "{{ role_path }}/templates/conflist.inf.j2.j2.7400MCN0P01R01" dest: /opt/tsg/tsg-os-provision/templates/conflist.inf.j2 tags: template when: @@ -58,7 +58,7 @@ - name: Template the asymmetric_presence_layer.conf.j2 - tsg_9140 template: - src: "{{ role_path }}/templates/tsg_9140/asymmetric_presence_layer.conf.j2" + src: "{{ role_path }}/templates/asymmetric_presence_layer.conf.j2.9000NPBP01R01" dest: /home/mesasoft/sapp_run/etc/asymmetric_presence_layer.conf tags: template when: @@ -66,7 +66,7 @@ - name: Template the asymmetric_presence_layer.conf.j2 - tsg-7400 template: - src: "{{ role_path }}/templates/tsg_7400/asymmetric_presence_layer.conf.j2.j2" + src: "{{ role_path }}/templates/asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01" dest: /opt/tsg/tsg-os-provision/templates/asymmetric_presence_layer.conf.j2 tags: template when: @@ -75,7 +75,7 @@ - name: Template the necessary_plug_list.conf - tsg_9140 template: - src: "{{ role_path }}/templates/tsg_9140/necessary_plug_list.conf.j2" + src: "{{ role_path }}/templates/necessary_plug_list.conf.j2.9000NPBP01R01" dest: /home/mesasoft/sapp_run/etc/necessary_plug_list.conf tags: template when: @@ -83,7 +83,7 @@ - name: Template the necessary_plug_list.conf - tsg_7400 template: - src: "{{ role_path }}/templates/tsg_7400/necessary_plug_list.conf.j2.j2" + src: "{{ role_path }}/templates/necessary_plug_list.conf.j2.j2.7400MCN0P01R01" dest: /opt/tsg/tsg-os-provision/templates/necessary_plug_list.conf.j2 tags: template when: @@ -91,7 +91,7 @@ - name: Template the vlan_flipping_map.conf - tsg-9140 template: - src: "{{ role_path }}/templates/tsg_9140/vlan_flipping_map.conf.j2" + src: "{{ role_path }}/templates/vlan_flipping_map.conf.j2.9000NPBP01R01" dest: /home/mesasoft/sapp_run/etc/vlan_flipping_map.conf tags: template when: @@ -99,7 +99,7 @@ - name: Template the vlan_flipping_map.conf - tsg-7400 template: - src: "{{ role_path }}/templates/tsg_7400/vlan_flipping_map.conf.j2.j2" + src: "{{ role_path }}/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01" dest: /opt/tsg/tsg-os-provision/templates/vlan_flipping_map.conf.j2 tags: template when: diff --git a/ansible/roles/sapp/templates/tsg_9140/asymmetric_presence_layer.conf.j2 b/ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.9000NPBP01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_9140/asymmetric_presence_layer.conf.j2 rename to ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.9000NPBP01R01 diff --git a/ansible/roles/sapp/templates/tsg_7400/asymmetric_presence_layer.conf.j2.j2 b/ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_7400/asymmetric_presence_layer.conf.j2.j2 rename to ansible/roles/sapp/templates/asymmetric_presence_layer.conf.j2.j2.7400MCN0P01R01 diff --git a/ansible/roles/sapp/templates/tsg_9140/conflist.inf.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.9000NPBP01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_9140/conflist.inf.j2 rename to ansible/roles/sapp/templates/conflist.inf.j2.9000NPBP01R01 diff --git a/ansible/roles/sapp/templates/tsg_7400/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_7400/conflist.inf.j2.j2 rename to ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 diff --git a/ansible/roles/sapp/templates/tsg_9140/necessary_plug_list.conf.j2 b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2.9000NPBP01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_9140/necessary_plug_list.conf.j2 rename to ansible/roles/sapp/templates/necessary_plug_list.conf.j2.9000NPBP01R01 diff --git a/ansible/roles/sapp/templates/tsg_7400/necessary_plug_list.conf.j2.j2 b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2.j2.7400MCN0P01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_7400/necessary_plug_list.conf.j2.j2 rename to ansible/roles/sapp/templates/necessary_plug_list.conf.j2.j2.7400MCN0P01R01 diff --git a/ansible/roles/sapp/templates/tsg_9140/vlan_flipping_map.conf.j2 b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.9000NPBP01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_9140/vlan_flipping_map.conf.j2 rename to ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.9000NPBP01R01 diff --git a/ansible/roles/sapp/templates/tsg_7400/vlan_flipping_map.conf.j2.j2 b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 similarity index 100% rename from ansible/roles/sapp/templates/tsg_7400/vlan_flipping_map.conf.j2.j2 rename to ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01