matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates based on review

Browse Source
This commit is contained in:
kram 2018-03-12 21:06:38 -07:00
parent 8fff27e46b
commit b02b29a984
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-orchagent/swssconfig.sh
View File

@ -27,7 +27,7 @@ fast_reboot
HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"` HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`
SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json " SWSSCONFIG_ARGS="00-copp.config.json ports.json switch.json "
if [ "$HWSKU" == "Force10-S6000" ]; then if [ "$HWSKU" == "Force10-S6000" ]; then
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json " SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
@ -42,6 +42,10 @@ elif [[ "$HWSKU" == "ACS-MSN27"* ]]; then
SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json " SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json "
fi fi
if [[ "$HWSKU" != "montara" ] && [ "$HWSKU" != "mavericks" ] && [ "$HWSKU" != "OSW1800-48x6q" ] && [ "$HWSKU" != "INGRASYS-S9180-32X"]]; then
SWSSCONFIG_ARGS+="ipinip.json "
fi
for file in $SWSSCONFIG_ARGS; do for file in $SWSSCONFIG_ARGS; do
swssconfig /etc/swss/config.d/$file swssconfig /etc/swss/config.d/$file
sleep 1 sleep 1

5
files/image_config/interfaces/interfaces.j2
View File

@ -20,9 +20,8 @@ iface lo {{ 'inet' if prefix | ipv4 else 'inet6' }} static
{% block mgmt_interface %} {% block mgmt_interface %}
# BMC interface # BMC interface
auto usb0 auto usb0
iface usb0 inet static iface usb0 inet6 auto
address 192.168.0.2
netmask 255.255.255.0
# The management network interface # The management network interface
auto eth0 auto eth0
{% if MGMT_INTERFACE %} {% if MGMT_INTERFACE %}

6
platform/barefoot/one-image.mk
View File

@ -4,8 +4,8 @@ SONIC_ONE_IMAGE = sonic-barefoot.bin
$(SONIC_ONE_IMAGE)_MACHINE = barefoot $(SONIC_ONE_IMAGE)_MACHINE = barefoot
$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_INSTALLS += $(WNC_OSW1800_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(WNC_OSW1800_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_INSTALLS += $(INGRASYS_S9180_32X_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(INGRASYS_S9180_32X_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES) $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)

1
platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/files
View File

@ -1 +0,0 @@
platform-modules-wnc-osw1800_1.0_amd64.deb main extra

5
src/sonic-config-engine/tests/sample_output/interfaces
View File

@ -17,9 +17,8 @@ iface lo inet6 static
# #
# BMC interface # BMC interface
auto usb0 auto usb0
iface usb0 inet static iface usb0 inet6 auto
address 192.168.0.2
netmask 255.255.255.0
# The management network interface # The management network interface
auto eth0 auto eth0
iface eth0 inet static iface eth0 inet static