Skip to content

Commit b7eaa05

Browse files
author
shi-su
committed
move swss_var.j2 to docker-config-engine
1 parent 030247f commit b7eaa05

File tree

16 files changed

+20
-15
lines changed

16 files changed

+20
-15
lines changed

‎dockers/docker-config-engine-buster/Dockerfile.j2

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ RUN pip install \
3939
{{ install_python_wheels(docker_config_engine_buster_whls.split(' ')) }}
4040
{% endif %}
4141

42+
# Copy files
43+
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
44+
4245
## Clean up
4346
RUN apt-get purge -y \
4447
python-pip \

‎dockers/docker-config-engine-stretch/Dockerfile.j2

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ RUN pip install \
3838
{{ install_python_wheels(docker_config_engine_stretch_whls.split(' ')) }}
3939
{% endif %}
4040

41+
# Copy files
42+
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
43+
4144
## Clean up
4245
RUN apt-get purge -y \
4346
python-pip \

‎dockers/docker-config-engine/Dockerfile.j2

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ python-wheels/{{ whl }}{{' '}}
4242
{%- endfor %}
4343
{%- endif -%}
4444

45+
# Copy files
46+
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
47+
4548
## Clean up
4649
RUN apt-get purge -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
4750
RUN rm -rf /debs /python-wheels

‎dockers/docker-orchagent/orchagent.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
SWSS_VARS_FILE=/etc/sonic/swss_syncd_vars.j2
3+
SWSS_VARS_FILE=/usr/share/sonic/templates/swss_vars.j2
44

55
# Retrieve SWSS vars from sonic-cfggen
66
SWSS_VARS=$(sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t $SWSS_VARS_FILE) || exit 1

‎files/build_templates/sonic_debian_extension.j2

-3
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,3 @@ sudo cp $BUILD_SCRIPTS_DIR/mask_disabled_services.py $FILESYSTEM_ROOT/tmp/
625625
sudo chmod a+x $FILESYSTEM_ROOT/tmp/mask_disabled_services.py
626626
sudo LANG=C chroot $FILESYSTEM_ROOT /tmp/mask_disabled_services.py
627627
sudo rm -rf $FILESYSTEM_ROOT/tmp/mask_disabled_services.py
628-
629-
# Copy synchronous mode configuration template
630-
sudo cp $BUILD_TEMPLATES/swss_syncd_vars.j2 $FILESYSTEM_ROOT_ETC_SONIC/

‎files/build_templates/swss_syncd_vars.j2 renamed to ‎files/build_templates/swss_vars.j2

File renamed without changes.

‎platform/p4/docker-sonic-p4.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ $(DOCKER_SONIC_P4)_DEPENDS += $(QUAGGA)
2525

2626
$(DOCKER_SONIC_P4)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
2727
$(ARP_UPDATE_SCRIPT) \
28-
$(ARP_UPDATE_VARS_TEMPLATE) \
29-
$(SWSS_SYNCD_VARS_TEMPLATE)
28+
$(ARP_UPDATE_VARS_TEMPLATE)
3029

3130
$(DOCKER_SONIC_P4)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
3231
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_P4)

‎platform/p4/docker-sonic-p4/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
8888
COPY ["files/configdb-load.sh", "/usr/bin/"]
8989
COPY ["files/arp_update", "/usr/bin"]
9090
COPY ["files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
91-
COPY ["files/swss_syncd_vars.j2", "/etc/sonic/"]
9291
RUN echo "docker-sonic-p4" > /etc/hostname
9392
RUN touch /etc/quagga/zebra.conf
9493

‎platform/p4/docker-sonic-p4/orchagent.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
SWSS_VARS_FILE=/etc/sonic/swss_syncd_vars.j2
3+
SWSS_VARS_FILE=/usr/share/sonic/templates/swss_vars.j2
44

55
# Retrieve SWSS vars from sonic-cfggen
66
SWSS_VARS=$(sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t $SWSS_VARS_FILE) || exit 1

‎platform/vs/docker-sonic-vs.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
4646
$(BUFFERS_CONFIG_TEMPLATE) \
4747
$(QOS_CONFIG_TEMPLATE) \
4848
$(SONIC_VERSION) \
49-
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
50-
$(SWSS_SYNCD_VARS_TEMPLATE)
49+
$(UPDATE_CHASSISDB_CONFIG_SCRIPT)
5150

5251
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
5352
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)

‎platform/vs/docker-sonic-vs/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ COPY ["chassis_db.py", "/usr/bin/"]
147147

148148
COPY ["platform.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/"]
149149
COPY ["hwsku.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/"]
150-
COPY ["files/swss_syncd_vars.j2", "/etc/sonic/"]
151150

152151
# Workaround the tcpdump issue
153152
RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump

‎platform/vs/docker-sonic-vs/orchagent.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ else
66
export platform=$fake_platform
77
fi
88

9-
SWSS_VARS_FILE=/etc/sonic/swss_syncd_vars.j2
9+
SWSS_VARS_FILE=/usr/share/sonic/templates/swss_vars.j2
1010

1111
# Retrieve SWSS vars from sonic-cfggen
1212
SWSS_VARS=$(sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t $SWSS_VARS_FILE) || exit 1

‎rules/docker-config-engine-buster.mk

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SWSSSDK_PY2)
77
$(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
88
$(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)
99
$(DOCKER_CONFIG_ENGINE_BUSTER)_LOAD_DOCKERS += $(DOCKER_BASE_BUSTER)
10+
$(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $(SWSS_VARS_TEMPLATE)
1011

1112
$(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS = $($(DOCKER_BASE_BUSTER)_DBG_DEPENDS)
1213
$(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BUSTER)_DBG_IMAGE_PACKAGES)

‎rules/docker-config-engine-stretch.mk

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SWSSSDK_PY2)
66
$(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
77
$(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)
88
$(DOCKER_CONFIG_ENGINE_STRETCH)_LOAD_DOCKERS += $(DOCKER_BASE_STRETCH)
9+
$(DOCKER_CONFIG_ENGINE_STRETCH)_FILES += $(SWSS_VARS_TEMPLATE)
910

1011
$(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS = $($(DOCKER_BASE_STRETCH)_DBG_DEPENDS)
1112
$(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_STRETCH)_DBG_IMAGE_PACKAGES)

‎rules/docker-config-engine.mk

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ $(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SWSSSDK_PY2)
66
$(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
77
$(DOCKER_CONFIG_ENGINE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)
88
$(DOCKER_CONFIG_ENGINE)_LOAD_DOCKERS += $(DOCKER_BASE)
9+
$(DOCKER_CONFIG_ENGINE)_FILES += $(SWSS_VARS_TEMPLATE)
910
SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE)

‎rules/scripts.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ $(SYSCTL_NET_CONFIG)_PATH = files/image_config/sysctl
2323
UPDATE_CHASSISDB_CONFIG_SCRIPT = update_chassisdb_config
2424
$(UPDATE_CHASSISDB_CONFIG_SCRIPT)_PATH = files/scripts
2525

26-
SWSS_SYNCD_VARS_TEMPLATE = swss_syncd_vars.j2
27-
$(SWSS_SYNCD_VARS_TEMPLATE)_PATH = files/build_templates
26+
SWSS_VARS_TEMPLATE = swss_vars.j2
27+
$(SWSS_VARS_TEMPLATE)_PATH = files/build_templates
2828

2929
SONIC_COPY_FILES += $(CONFIGDB_LOAD_SCRIPT) \
3030
$(ARP_UPDATE_SCRIPT) \
@@ -34,4 +34,4 @@ SONIC_COPY_FILES += $(CONFIGDB_LOAD_SCRIPT) \
3434
$(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) \
3535
$(SYSCTL_NET_CONFIG) \
3636
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
37-
$(SWSS_SYNCD_VARS_TEMPLATE)
37+
$(SWSS_VARS_TEMPLATE)

0 commit comments

Comments
 (0)