From feba6aefe4efbdf68bba46e2fa5662aa3d2fcacd Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Thu, 2 Mar 2017 22:29:04 +0000 Subject: [PATCH 1/2] Check if device requires DHCP relay upon docker start --- dockers/docker-dhcp-relay/config.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dockers/docker-dhcp-relay/config.sh b/dockers/docker-dhcp-relay/config.sh index 99df251572d5..1e1393dc1bf4 100755 --- a/dockers/docker-dhcp-relay/config.sh +++ b/dockers/docker-dhcp-relay/config.sh @@ -1,4 +1,12 @@ #!/bin/bash +MINIGRAPH_HOSTNAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_hostname"` +DEVICE_ROLE=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_devices['$MINIGRAPH_HOSTNAME']['type']"` + +if [ $DEVICE_ROLE != "ToRRouter" ]; then + echo "Device does not require DHCP relay. docker-dhcp-relay exiting..." + exit 1 +fi + sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/isc-dhcp-relay.j2 > /etc/default/isc-dhcp-relay From 0fdd3c8e9a38f070421339b2e2896b8d83b24a69 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Mon, 6 Mar 2017 20:39:45 +0000 Subject: [PATCH 2/2] Remove unnecessary call to sonic-cfggen --- dockers/docker-dhcp-relay/config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockers/docker-dhcp-relay/config.sh b/dockers/docker-dhcp-relay/config.sh index 1e1393dc1bf4..2a2453b6cd2a 100755 --- a/dockers/docker-dhcp-relay/config.sh +++ b/dockers/docker-dhcp-relay/config.sh @@ -1,7 +1,6 @@ #!/bin/bash -MINIGRAPH_HOSTNAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_hostname"` -DEVICE_ROLE=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_devices['$MINIGRAPH_HOSTNAME']['type']"` +DEVICE_ROLE=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_devices[minigraph_hostname]['type']"` if [ $DEVICE_ROLE != "ToRRouter" ]; then echo "Device does not require DHCP relay. docker-dhcp-relay exiting..."