Single image implementation

Makefile

@@ -30,6 +30,7 @@ DOCKER_BUILD = docker build --no-cache \
 	    -C sonic \
 	    -f slave.mk \
 	    PLATFORM=$(PLATFORM) \
+	    SKU=$(SKU) \
 	    $@
 
 sonic-slave-build :

build_debian.sh

@@ -132,15 +132,6 @@ sudo chroot $FILESYSTEM_ROOT update-initramfs -u
 ## Install latest intel igb driver
 sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
 
-## Install package without starting service
-## ref: https://wiki.debian.org/chroot
-trap_push 'sudo rm -f $FILESYSTEM_ROOT/usr/sbin/policy-rc.d'
-sudo tee -a $FILESYSTEM_ROOT/usr/sbin/policy-rc.d > /dev/null <<EOF
-#!/bin/sh
-exit 1
-EOF
-sudo chmod a+x $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
-
 ## Install docker
 echo '[INFO] Install docker'
 ## Install apparmor utils since they're missing and apparmor is enabled in the kernel
@@ -172,7 +163,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
 ## Note: gdisk is needed for sgdisk in install.sh
 ## Note: parted is needed for partprobe in install.sh
 ## Note: ca-certificates is needed for easy_install
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
     file                    \
     ifupdown                \
     iproute2                \
@@ -195,7 +186,9 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
     i2c-tools               \
     efibootmgr              \
     usbutils                \
-    pciutils
+    pciutils                \
+    iptables-persistent     \
+    logrotate
 
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
@@ -248,6 +241,10 @@ EOF
 
 sudo cp files/dhcp/rfc3442-classless-routes $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d
 
+if [ -f sonic_debian_extension.sh ]; then
+    ./sonic_debian_extension.sh $FILESYSTEM_ROOT
+fi
+
 ## Clean up apt
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoremove
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean
@@ -268,6 +265,9 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hs $FILESYSTEM_ROOT
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker
 
+## Compress docker files
+pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS var/lib/docker; popd
+
 ## Compress together with /boot and /var/lib/docker as an installer payload zip file
-pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ -r var/lib/docker; popd
-sudo zip -g $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
+pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/; popd
+sudo zip -g $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

build_image.sh

@@ -21,14 +21,14 @@ GIT_REVISION=$(git rev-parse --short HEAD)
 
 mkdir -p `dirname $OUTPUT_ONIE_IMAGE`
 sudo rm -f $OUTPUT_ONIE_IMAGE
-if [ "$TARGET_MACHINE" = "generic" ]; then
+if [ "$IMAGE_TYPE" = "onie" ]; then
     ## Generate an ONIE installer image
     ## Note: Don't leave blank between lines. It is single line command.
     ./onie-mk-demo.sh $TARGET_PLATFORM $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
-          installer $TARGET_MACHINE/platform.conf $OUTPUT_ONIE_IMAGE OS $GIT_REVISION $ONIE_IMAGE_PART_SIZE \
+          installer platform/$TARGET_MACHINE/platform.conf $OUTPUT_ONIE_IMAGE OS $GIT_REVISION $ONIE_IMAGE_PART_SIZE \
           $ONIE_INSTALLER_PAYLOAD
 ## Use 'aboot' as target machine category which includes Aboot as bootloader
-elif [ "$TARGET_MACHINE" = "aboot" ]; then
+elif [ "$IMAGE_TYPE" = "aboot" ]; then
     ## Add Aboot boot0 file into the image
     cp $ONIE_INSTALLER_PAYLOAD $OUTPUT_ONIE_IMAGE
     pushd files/Aboot && sudo zip -g $OLDPWD/$OUTPUT_ONIE_IMAGE boot0; popd

dockers/docker-snmp-sv2/config.sh

@@ -8,7 +8,7 @@ mkdir -p /etc/snmp
 sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/snmp.yml -t /etc/swss/snmp/snmpd.conf.j2 >/etc/snmp/snmpd.conf
 
 hwsku=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
-/bin/cp -rf /usr/share/sonic/$hwsku/alias_map.json /etc/snmp/
+/bin/cp -rf /etc/ssw/$hwsku/alias_map.json /etc/snmp/
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

files/build_templates/bgp.service.j2

@@ -0,0 +1,12 @@
+[Unit]
+Description=BGP container
+Requires=database.service
+After=database.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/database.service.j2

@@ -0,0 +1,12 @@
+[Unit]
+Description=Database container
+Requires=docker.service
+After=docker.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/docker_image_ctl.j2

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+start() {
+    docker inspect --type container {{docker_container_name}} &>/dev/null
+    if [ "$?" -eq "0" ]; then
+        docker start -a {{docker_container_name}}
+    else
+        docker run {{docker_image_run_opt}} --name={{docker_container_name}} {{docker_image_name}}
+    fi
+}
+
+stop() {
+    docker stop {{docker_container_name}}
+}
+
+case "$1" in
+    start|stop)
+        $1
+        ;;
+    *)
+        echo "Usage: $0 {start|stop}"
+        exit 1
+        ;;
+esac
+

files/build_templates/lldp.service.j2

@@ -0,0 +1,12 @@
+[Unit]
+Description=LLDP container
+Requires=database.service
+After=database.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/snmp.service.j2

@@ -0,0 +1,12 @@
+[Unit]
+Description=SNMP container
+Requires=database.service
+After=database.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/sonic_debian_extension.j2

@@ -0,0 +1,124 @@
+#!/bin/bash
+## This script is to automate loading of vendor specific docker images
+## and instalation of configuration files and vendor specific packages
+## to debian file system.
+##
+## USAGE:
+##   ./sonic_debian_extension.sh FILESYSTEM_ROOT
+## PARAMETERS:
+##   FILESYSTEM_ROOT
+##          Path to debian file system root directory
+
+FILESYSTEM_ROOT=$1
+[ -n "$FILESYSTEM_ROOT" ] || {
+    echo "Error: no or empty FILESYSTEM_ROOT argument"
+    exit 1
+}
+
+## Enable debug output for script
+set -x -e
+
+. functions.sh
+BUILD_TEMPLATES=files/build_templates
+IMAGE_CONFIGS=files/image_config
+VENDOR_CONFIGS=src/sonic-config-engine/platform
+
+{% if installer_debs.strip() -%}
+clean_sys() {
+    sudo umount $FILESYSTEM_ROOT/sys/fs/cgroup/*            \
+                $FILESYSTEM_ROOT/sys/fs/cgroup              \
+                $FILESYSTEM_ROOT/sys || true
+}
+trap_push clean_sys
+sudo LANG=C chroot $FILESYSTEM_ROOT mount sysfs /sys -t sysfs
+
+sudo chroot $FILESYSTEM_ROOT service docker start
+sudo chroot $FILESYSTEM_ROOT docker version
+
+# Install config engine dependencies
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
+    python-lxml    \
+    python-jinja2  \
+    python-netaddr \
+    python-ipaddr  \
+    python-yaml
+
+sudo dpkg --root=$FILESYSTEM_ROOT -i {{config_engine}}
+
+# Create all needed directories
+sudo mkdir -p $FILESYSTEM_ROOT/etc/ssw/
+sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic/
+sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic/templates/
+
+# Apply apt configuration files
+sudo cp $IMAGE_CONFIGS/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
+sudo cp -R $IMAGE_CONFIGS/apt/sources.list.d/ $FILESYSTEM_ROOT/etc/apt/
+cat $IMAGE_CONFIGS/apt/sonic-dev.gpg.key | sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
+
+# Apply environtment configuration files
+sudo cp $IMAGE_CONFIGS/environment/environment $FILESYSTEM_ROOT/etc/
+sudo cp $IMAGE_CONFIGS/environment/motd $FILESYSTEM_ROOT/etc/
+
+# Copy default minigraph
+sudo cp $IMAGE_CONFIGS/minigraph/minigraph_{{sonic_hwsku}}.xml $FILESYSTEM_ROOT/etc/sonic/minigraph.xml
+
+# Copy NTP configuration files and templates
+sudo cp $IMAGE_CONFIGS/ntp/ntp-config.service $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ntp-config.service
+sudo cp $IMAGE_CONFIGS/ntp/ntp-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/ntp/ntp.conf.j2 $FILESYSTEM_ROOT/etc/sonic/templates/
+sudo cp $IMAGE_CONFIGS/ntp/ntp.yml $FILESYSTEM_ROOT/etc/sonic/
+
+# Copy rsyslog configuration files and templates
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog-config.service  $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable rsyslog-config.service
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.conf.j2 $FILESYSTEM_ROOT/etc/sonic/templates/
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.yml $FILESYSTEM_ROOT/etc/sonic/
+sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.d/* $FILESYSTEM_ROOT/etc/rsyslog.d/
+
+# Copy interfaces configuration files and templates
+sudo cp $IMAGE_CONFIGS/interfaces/interfaces-config.service  $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable interfaces-config.service
+sudo cp $IMAGE_CONFIGS/interfaces/interfaces-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/interfaces/*.j2 $FILESYSTEM_ROOT/etc/sonic/templates/
+
+# Copy SNMP configuration files
+sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/
+
+# Generate system desription file
+export git_revision=$(git rev-parse --short HEAD)
+export sonic_hwsku={{sonic_hwsku}}
+export debian_version=`cat $FILESYSTEM_ROOT/etc/debian_version`
+export kernel_version={{kversion}}
+j2 $BUILD_TEMPLATES/sysDescription.j2 > sysDescription 
+sudo mv sysDescription $FILESYSTEM_ROOT/etc/ssw/
+
+# Copy sudoers configuration file
+sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
+
+# Copy vendor specific configuration files
+sudo cp -R $VENDOR_CONFIGS/{{sonic_hwsku}}/ $FILESYSTEM_ROOT/etc/ssw/
+
+{% for deb in installer_debs.strip().split(' ') -%}
+sudo dpkg --extract {{deb}} $FILESYSTEM_ROOT
+{% endfor %}
+## Run depmod command for target kernel modules
+sudo LANG=C chroot $FILESYSTEM_ROOT depmod -a {{kversion}}
+{% endif %}
+{% if installer_images.strip() -%}
+{% for image in installer_images.strip().split(' ') -%}
+sudo LANG=C chroot $FILESYSTEM_ROOT docker load < {{image}}
+{% endfor %}
+sudo chroot $FILESYSTEM_ROOT service docker stop
+{% for script in installer_start_scrips.split(' ') -%}
+sudo cp {{script}} $FILESYSTEM_ROOT/usr/bin/
+{% endfor %}
+{% for service in installer_services.split(' ') -%}
+sudo cp {{service}} $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable {{service}}
+{% endfor %}
+sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
+sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
+{% endif %}
+

files/build_templates/swss.service.j2

@@ -0,0 +1,13 @@
+[Unit]
+Description=orchagent container
+Requires=database.service
+After=database.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStopPost=/usr/bin/syncd.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/syncd.service.j2

@@ -0,0 +1,29 @@
+[Unit]
+Description=syncd container
+Requires=database.service
+After=database.service
+
+[Service]
+User=root
+{% if sonic_hwsku == 'ACS-MSN2700' %}
+ExecStartPre=/etc/init.d/sxdkernel start
+ExecStartPre=/usr/bin/mst start
+ExecStartPre=/etc/mlnx/msn2700 start
+{% elif sonic_hwsku == 'AS7512' %}
+ExecStartPre=-/etc/init.d/xpnet.sh stop
+ExecStartPre=/etc/init.d/xpnet.sh start
+{% endif %}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+{% if sonic_hwsku == 'ACS-MSN2700' %}
+ExecStopPost=/etc/mlnx/msn2700 stop
+ExecStopPost=/etc/init.d/sxdkernel stop
+ExecStopPost=/usr/bin/mst stop
+{% elif sonic_hwsku == 'AS7512' %}
+ExecStopPost=/etc/init.d/xpnet.sh stop
+ExecStopPost=/etc/init.d/xpnet.sh start
+{% endif %}
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

files/build_templates/sysDescription.j2

@@ -0,0 +1 @@
+SONiC Software Version: SONiC-OS-{{git_revision}}  HwSku: {{sonic_hwsku}} - Distribution: Debian {{debian_version}} - Kernel: {{kernel_version}}

files/build_templates/teamd.service.j2

@@ -0,0 +1,12 @@
+[Unit]
+Description=TEAMD container
+Requires=database.service
+After=database.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStart=/usr/bin/{{docker_container_name}}.sh start
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+
+[Install]
+WantedBy=multi-user.target

files/image_config/apt/sonic-dev.gpg.key

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFQ1bTIBCAC7oGfkv/ck0XsLuG8cdcSB2ISqxFAcBvH9BitEtxmpW2uhykKk
+xY4rVD/4Uys1s3PF1/64QfPR+hYcewueOwz0ZAcLyFXXk4McICXaPq3NrLiWYKKX
+UZLnrPzcrGZoW/kHDDp4OmBiDmT1PGvZlpuimwkMCusUzIr7Cbbp2dIy8MERL5tA
+LcgLu3KL6clJ+aTW2jgepI1D7sTepOeGd7eRSb5njKg2M7k/93v/7MipZxiVtyXH
+B74YiK6jSbst5JpuYsLa/Dqryvx7Xq3n53oif892pv3euTduo1fYw8Hgh/OOYdeT
+c9WCj03KA1jCSFURjdrug0kR8BPlfjqtRLXFABEBAAG0JE1TIE9wZW4gVGVjaCA8
+aW50ZXJvcEBtaWNyb3NvZnQuY29tPokBOAQTAQIAIgUCVDVtMgIbAwYLCQgHAwIG
+FQgCCQoLBBYCAwECHgECF4AACgkQsCxG30F6CJO1uAf/cmL68bM8YgF/61hkaY56
+LqrppUTJH/w4fKq47Pf6KfgSLvxfNU6soi2KHYRjIvTRx3tV4vUM5n2plaQg2s8V
+/Epg4FeIRTk75YwiHAzLhLnp5cdUaTvC4j4mwxoB6j9Ty+fXJwQ0MvpDhIZb9vM4
+GXw/fEQHCT4f3gx4nReeqE+FB2wVHleX9+Lpodu98JyJTKJRBRHYLqy6S+/lyp2W
+aBlsI1LOqBcx1uRK24U7duIpbYwIyrx0cafSruqR2GjVdu+imkhHyUn52VbzYhq1
+af0rqYiZ1VOamVOG0By8+hVyNa1MLc1K2uWGs0o5fDe9F5/swbvLHVXI+M50Vs+m
+J7kBDQRUNW0yAQgAu7DkTVj0ZQC4F7bFivAwrdby8gCakTXOl1kcK622hjRJ8nam
+aZeW+eADfLRsTmdUmXgZu1YWS5Gn2ZVngC8SGPUBT071+oRETCz4uNB7IimB9QfP
+++orI6o2vmnVVsq5wWCbEdNU+TCVv1zjrYev5lwckkKpjHt6o8MNoX2DFuQymSyR
+eZKaqhdKmcji4Ke7OIYqwgPjch3wxzE1b5gNOR/iwxWyjjOffZPLr/VhIfIJRs86
+dSXrwjHtEh810SKDLghHM0VAdY34nyC5ZZ61yhts5HtQDFK+9mNpH1mkc4gDBlgG
+266pVvknumK6lPNm/osF/cpjWmEw24ypcQIvOQARAQABiQEfBBgBAgAJBQJUNW0y
+AhsMAAoJELAsRt9BegiTMBUH/0sZ6gZy7mCTSAYT+NSXLFtGC2zNUVL80SWvfgYm
+k9XPVI22MrefZfQ6M01RylyxtWXjRM8UoN8SDKWPpXumzJf831f/7om5zwutaG7b
+tjDPYqRKJSbAIFZu2mN+uLrNQ2SV6XK7FoV0dtcrEX9S7RICb6i19D+70+Oh/qgU
+R04H1jqS29XBzqAlIzdBoA+sYAwbOIJsSL3YyNQcUv3B5+5yR/bo/L8pnUJt6iuL
+nWW+mi7r8gWPHDSrcdYq1TmmlOM7CwZPgWRZzkQPSeZz52Tt7IP47eyGJ09U4PIf
+FtMH1ElL2UgHoA/F9Q88e7LkztaTqE59uXWbIYyuSMJVvRU=
+=sb3d
+-----END PGP PUBLIC KEY BLOCK-----

files/image_config/apt/sources.list.d/debian_archive_trafficmanager_net_debian.list

@@ -0,0 +1 @@
+deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free

files/image_config/apt/sources.list.d/packages_microsoft_com_repos_sonic_dev.list

@@ -0,0 +1 @@
+deb [arch=amd64] http://packages.microsoft.com/repos/sonic-dev/ jessie main

files/image_config/environment/environment

@@ -0,0 +1 @@
+VTYSH_PAGER=more