Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default dhcp_relay.yml file to OneImage build #341

Closed
wants to merge 1 commit into from
Closed

Add default dhcp_relay.yml file to OneImage build #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ sudo bash -c "echo enabled=false > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
# Copy SNMP configuration files
sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/

# Copy initial DHCP relay configuration file, will be overwritten after docker starts
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I don't think anyone will overwrite this file. This file is the input of config.sh for dhcp relay docker and the real configuration will be generated according to this file.

Copy link
Contributor Author

@jleveque jleveque Feb 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So until the DHCP servers are stored in the minigraph, this file must be manually edited to contain the actual DHCP server IPs?

sudo cp $IMAGE_CONFIGS/dhcp_relay/dhcp_relay.yml $FILESYSTEM_ROOT/etc/sonic/

# Generate build version file
export git_revision=$(git rev-parse --short HEAD)
export sonic_hwsku={{sonic_hwsku}}
Expand Down
1 change: 1 addition & 0 deletions files/image_config/dhcp_relay/dhcp_relay.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dhcp_servers: []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to double confirm - have you verified that dhcp relay docker can start correctly with this empty value?