From f5df01c7f1cb35015f103f3c935d8729cd298e67 Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Fri, 8 Nov 2019 21:44:25 -0800
Subject: [PATCH] Revert "[services] make snmp.timer work again and delay
 telemetry.service (#3657)" (#3729)

This reverts commit d346cb3898d58aeb16c22a66a79b117ab267d4b8.
---
 files/build_templates/snmp.service.j2           | 2 ++
 files/build_templates/sonic_debian_extension.j2 | 6 ++----
 files/build_templates/telemetry.service.j2      | 2 ++
 files/build_templates/telemetry.timer           | 9 ---------
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 files/build_templates/telemetry.timer

diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
index 9d419b8e0dfd..310048e68beb 100644
--- a/files/build_templates/snmp.service.j2
+++ b/files/build_templates/snmp.service.j2
@@ -14,3 +14,5 @@ ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 Restart=always
 RestartSec=30
 
+[Install]
+WantedBy=multi-user.target swss.service
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index bd1dfccd28dc..f5a734b3a273 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -317,7 +317,7 @@ EOF
 ## Bind docker path
 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
     sudo mkdir -p $FILESYSTEM_ROOT/dockerfs
-    sudo mount --bind dockerfs $FILESYSTEM_ROOT/dockerfs
+    sudo mount --bind dockerfs $FILESYSTEM_ROOT/dockerfs 
 fi
 
 {% if installer_images.strip() -%}
@@ -334,7 +334,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS ta
 {% endif %}
 {% endfor %}
 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
-    sudo umount $FILESYSTEM_ROOT/dockerfs
+    sudo umount $FILESYSTEM_ROOT/dockerfs 
     sudo rm -fr $FILESYSTEM_ROOT/dockerfs
     sudo kill -9 `sudo $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS_PID` || true
 else
@@ -362,8 +362,6 @@ sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
 # It implements delayed start of services
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
-sudo cp $BUILD_TEMPLATES/telemetry.timer $FILESYSTEM_ROOT/etc/systemd/system/
-sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable telemetry.timer
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2
index 4d653e42327d..2e7e45218df2 100644
--- a/files/build_templates/telemetry.service.j2
+++ b/files/build_templates/telemetry.service.j2
@@ -10,3 +10,5 @@ ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 
+[Install]
+WantedBy=multi-user.target
diff --git a/files/build_templates/telemetry.timer b/files/build_templates/telemetry.timer
deleted file mode 100644
index e08f1c09eac6..000000000000
--- a/files/build_templates/telemetry.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Delays telemetry container until SONiC has started
-
-[Timer]
-OnBootSec=3min 30 sec
-Unit=telemetry.service
-
-[Install]
-WantedBy=timers.target