add frr.conf and remove iptables and resolv.conf

metal-stack · Dec 5, 2024 · f7a2f44 · f7a2f44
1 parent 66056b3
commit f7a2f44
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/partition/roles/ztp/defaults/main/main.yaml b/partition/roles/ztp/defaults/main/main.yaml
@@ -10,8 +10,3 @@ ztp_port: 8080
 ztp_additional_files: []
 # - name: foo.sh
 #   data: echo
-
-ztp_sonic_nameservers: []
-ztp_sonic_extended_cacl:
-  ipv4: []
-  ipv6: []
diff --git a/partition/roles/ztp/files/frr.conf b/partition/roles/ztp/files/frr.conf
@@ -0,0 +1,9 @@
+frr defaults datacenter
+password zebra
+enable password zebra
+!
+log syslog informational
+log facility local4
+!
+agentx
+!
diff --git a/partition/roles/ztp/tasks/main.yaml b/partition/roles/ztp/tasks/main.yaml
@@ -26,7 +26,13 @@
     - ztp.json.j2
     - ztp.sh.j2
 
-- name: copy additional contents
+- name: copy frr.conf
+  copy:
+    dest: "{{ ztp_host_dir_path }}/config/frr.conf"
+    src: frr.conf
+    mode: 0644
+
+- name: copy additional files
   copy:
     dest: "{{ ztp_host_dir_path }}/config/{{ item.name }}"
     content: "{{ item.data }}"

diff --git a/partition/roles/ztp/templates/iptables.json.j2 b/partition/roles/ztp/templates/iptables.json.j2
diff --git a/partition/roles/ztp/templates/resolv.conf.j2 b/partition/roles/ztp/templates/resolv.conf.j2
diff --git a/partition/roles/ztp/templates/ztp.json.j2 b/partition/roles/ztp/templates/ztp.json.j2
@@ -9,14 +9,8 @@
       "files": [
         {
           "url": {
-            "source": "http://{{ ztp_listen_address }}:{{ ztp_port }}/resolv.conf",
-            "destination": "/etc/resolv.conf"
-          }
-        },
-        {
-          "url": {
-            "source": "http://{{ ztp_listen_address }}:{{ ztp_port }}/iptables.json",
-            "destination": "/etc/sonic/iptables.json"
+            "source": "http://{{ ztp_listen_address }}:{{ ztp_port }}/frr.conf",
+            "destination": "/etc/sonic/frr/frr.conf"
           }
         }
       ]