You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by resmo <gi...@git.apache.org> on 2015/11/07 11:32:47 UTC
[GitHub] cloudstack pull request: [4.5] CLOUDSTACK-9042: VR: DHCP: fix miss...
GitHub user resmo opened a pull request:
https://github.com/apache/cloudstack/pull/1045
[4.5] CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties
in /etc/dhcpentries.txt we had:
02:00:1e:07:01:53,set:10_102_92_5,10.102.92.5,songlog-1,infinite
02:00:0b:a2:00:3d,set:10_102_92_234,10.102.92.234,log-1,infinite
This sed matched unexpectetly "songlog-1" as well when "log-1" was processed, resulting
missing dhcp entry for songlog-1.
Also fixed other potenials problems relating to sed matching.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/resmo/cloudstack CLOUDSTACK-9042-4.5
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1045.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1045
----
commit e7291fd600ce922a76b1fe9cd2c120a40d4cbc18
Author: Rene Moser <re...@apache.org>
Date: 2015-11-06T11:25:10Z
CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties
in /etc/dhcpentries.txt we had:
02:00:1e:07:01:53,set:10_102_92_5,10.102.92.5,songlog-1,infinite
02:00:0b:a2:00:3d,set:10_102_92_234,10.102.92.234,log-1,infinite
This sed matched unexpectetly "songlog-1" as well when "log-1" was processed, resulting
missing dhcp entry for songlog-1.
Also fixed other potenials problems relating to sed matching.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: [4.5] CLOUDSTACK-9042: VR: DHCP: fix miss...
Posted by resmo <gi...@git.apache.org>.
Github user resmo commented on the pull request:
https://github.com/apache/cloudstack/pull/1045#issuecomment-158350734
@remibergsma @bhaisaab, no, not yet, created a patch for master before release of 4.6 #1042 but I was told it is not necessary, script is not used, was replaced by a python script and can be removed afterwards, so created #1093, but then @wilderrodrigues found out, maybe it is still used for hyperv, holding on for more info. so 4.6 and master not yet patched
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: [4.5] CLOUDSTACK-9042: VR: DHCP: fix miss...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/cloudstack/pull/1045
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: [4.5] CLOUDSTACK-9042: VR: DHCP: fix miss...
Posted by resmo <gi...@git.apache.org>.
Github user resmo commented on the pull request:
https://github.com/apache/cloudstack/pull/1045#issuecomment-158030442
Our test case on ACS 4.5.1:
# Before fix
## vanilla router deployed:
~~~
# related script
ae693b5ef2d9b1fed1307f6b38213823 /opt/cloud/bin/edithosts.sh
# see running VMs
$ cloudstack-cli server list --project stxt_integration --zone BIEL_CU01 --state running
Name Instance-Name State Offering Zone Project IP's
web-eq-03 i-70-5871-VM Running 2cpu_2gb BIEL_CU01 STXT_INTEGRATION 10.101.65.183 10.101.192.50 10.101.128.50
web-eq-01 i-70-5870-VM Running 2cpu_2gb BIEL_CU01 STXT_INTEGRATION 10.101.65.69 10.101.192.49 10.101.128.49
jumphost-eq-01 i-70-5874-VM Running 1cpu_1gb BIEL_CU01 STXT_INTEGRATION 10.101.65.113 10.101.192.52 10.101.128.52
# hosts on router (note vm eq-01 is stopped)
root@r-6215-VM:~# cat /etc/hosts
127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
10.101.65.1 r-6215-VM
10.101.65.176 eb-eq-04
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.85 eq-01
10.101.65.1 r-6215-VM
10.101.65.1 data-server
10.101.65.1 r-6215-VM
10.101.65.69 web-eq-01
10.101.65.183 web-eq-03
10.101.65.113 jumphost-eq-01
# dhcp hosts no problems as eq-01 entry was made before others *eq-01 entries.
root@r-6215-VM:~# cat /etc/dhcphosts.txt
02:00:11:bb:03:53,set:10_101_65_176,10.101.65.176,eb-eq-04,infinite
02:00:6e:44:03:58,set:10_101_65_85,10.101.65.85,eq-01,infinite
02:00:4f:6d:03:4b,set:10_101_65_69,10.101.65.69,web-eq-01,infinite
02:00:6f:94:03:4c,set:10_101_65_183,10.101.65.183,web-eq-03,infinite
02:00:7a:76:03:4e,set:10_101_65_113,10.101.65.113,jumphost-eq-01,infinite
~~~
## start a VM named eq-01
~~~
############# start a VM named eq-01
$ cloudstack-cli server list --project stxt_integration --zone BIEL_CU01 --state running
Name Instance-Name State Offering Zone Project IP's
web-eq-03 i-70-5871-VM Running 2cpu_2gb BIEL_CU01 STXT_INTEGRATION 10.101.65.183 10.101.192.50 10.101.128.50
web-eq-01 i-70-5870-VM Running 2cpu_2gb BIEL_CU01 STXT_INTEGRATION 10.101.65.69 10.101.192.49 10.101.128.49
eq-01 i-70-6216-VM Running 1cpu_1gb BIEL_CU01 STXT_INTEGRATION 10.101.65.85 10.101.192.76 10.101.128.76
jumphost-eq-01 i-70-5874-VM Running 1cpu_1gb BIEL_CU01 STXT_INTEGRATION 10.101.65.113 10.101.192.52 10.101.128.52
# hosts still looks "good"
root@r-6215-VM:~# cat /etc/hosts
127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
10.101.65.1 r-6215-VM
10.101.65.176 eb-eq-04
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 data-server
10.101.65.1 r-6215-VM
10.101.65.69 web-eq-01
10.101.65.183 web-eq-03
10.101.65.113 jumphost-eq-01
10.101.65.85 eq-01
# dhcp entries *eq-01 where removed... BAD!!!
root@r-6215-VM:~# cat /etc/dhcphosts.txt
02:00:11:bb:03:53,set:10_101_65_176,10.101.65.176,eb-eq-04,infinite
02:00:6f:94:03:4c,set:10_101_65_183,10.101.65.183,web-eq-03,infinite
02:00:6e:44:03:58,set:10_101_65_85,10.101.65.85,eq-01,infinite
~~~
# With fix applied!
## Reset test env: stop VM eq-01, apply fix, restart router
~~~
############### stop VM eq-01, apply fix, restart router
root@r-6215-VM:~# md5sum /opt/cloud/bin/edithosts.sh
a610c2dfb0248e6a74993d6452e14244 /opt/cloud/bin/edithosts.sh
# everything looks fine after reset again (just because eq-01 came earlier then *eq-01)
root@r-6215-VM:~# cat /etc/dhcphosts.txt
02:00:11:bb:03:53,set:10_101_65_176,10.101.65.176,eb-eq-04,infinite
02:00:6e:44:03:58,set:10_101_65_85,10.101.65.85,eq-01,infinite
02:00:4f:6d:03:4b,set:10_101_65_69,10.101.65.69,web-eq-01,infinite
02:00:6f:94:03:4c,set:10_101_65_183,10.101.65.183,web-eq-03,infinite
02:00:7a:76:03:4e,set:10_101_65_113,10.101.65.113,jumphost-eq-01,infinite
root@r-6215-VM:~# cat /etc/hosts
127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
10.101.65.1 r-6215-VM
10.101.65.176 eb-eq-04
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.85 eq-01
10.101.65.1 r-6215-VM
10.101.65.1 data-server
10.101.65.1 r-6215-VM
10.101.65.69 web-eq-01
10.101.65.183 web-eq-03
10.101.65.113 jumphost-eq-01
~~~
## start VM eq-01
~~~
#### start VM eq-01
# hosts still look good here after the fix
root@r-6215-VM:~# cat /etc/hosts
127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
10.101.65.1 r-6215-VM
10.101.65.176 eb-eq-04
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 r-6215-VM
10.101.65.1 data-server
10.101.65.1 r-6215-VM
10.101.65.69 web-eq-01
10.101.65.183 web-eq-03
10.101.65.113 jumphost-eq-01
10.101.65.85 eq-01
# /etc/dhcphosts looks as it should!
root@r-6215-VM:~# cat /etc/dhcphosts.txt
02:00:11:bb:03:53,set:10_101_65_176,10.101.65.176,eb-eq-04,infinite
02:00:4f:6d:03:4b,set:10_101_65_69,10.101.65.69,web-eq-01,infinite
02:00:6f:94:03:4c,set:10_101_65_183,10.101.65.183,web-eq-03,infinite
02:00:7a:76:03:4e,set:10_101_65_113,10.101.65.113,jumphost-eq-01,infinite
02:00:6e:44:03:58,set:10_101_65_85,10.101.65.85,eq-01,infinite
~~~
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: [4.5] CLOUDSTACK-9042: VR: DHCP: fix miss...
Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:
https://github.com/apache/cloudstack/pull/1045#issuecomment-158349810
LGTM, @remibergsma did we have the fix on 4.6/master already?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---