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 DHCP Relay #38

Merged
merged 13 commits into from
Nov 24, 2016
Merged

Add DHCP Relay #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cdf6370
added dhcp relay docker file, added isc-dhcp-relay config file
Oct 21, 2016
52d9847
added dhcp server package to ptf
Oct 21, 2016
f993736
changed indentation
Oct 21, 2016
fa22332
fixed indent
Oct 21, 2016
9855425
space change
Oct 21, 2016
ff30453
fixed space
Oct 21, 2016
defefb4
added clean in relay docker, fixed indentation, and fixed relay confi…
Oct 25, 2016
89ac3bd
fixing indentation...
Oct 25, 2016
43af986
fixing indentation again
Oct 25, 2016
55730ba
fixing indentation once again
Oct 25, 2016
0d37b2f
changed tabs/space indentation differences
Oct 26, 2016
6bc5703
added rsyslog
Nov 8, 2016
5a88ed1
removed isc-dhcp-server from ptf
Nov 8, 2016
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
17 changes: 17 additions & 0 deletions dockers/docker-dhcp-relay/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM docker-base

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

## Install isc-dhcp-relay
## Clean up
RUN apt-get update && apt-get -y install \
isc-dhcp-relay && \
apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y

COPY isc-dhcp-relay /etc/default/isc-dhcp-relay

ENTRYPOINT service rsyslog start \
&& service isc-dhcp-relay start \
&& /bin/bash

6 changes: 6 additions & 0 deletions dockers/docker-dhcp-relay/isc-dhcp-relay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SERVERS=""

INTERFACES=""

#-a provides option 82 circuit id information
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 24, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

The comment does not make sense. #Closed

Copy link
Contributor

Choose a reason for hiding this comment

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

I think Manny is explaining that the -a option enables the relay agent to use DHCP's option82 function.
Manny, I think you need to actually specify OPTIONS="-a", right?

Copy link
Contributor Author

@mbrar mbrar Oct 25, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, the -a option enables the use of DHCP Option 82. I left Option 82 off by default but it might make more sense to set OPTIONS="-a"

OPTIONS="-a"