CORD-1911 Ensure that switches always get same IP address from MAAS DHCP
Change-Id: Ia259be69708234082e71c01e2c46c6cdf6d49629
(cherry picked from commit cd620a105a7f18b087a9d9e0693b57365699dfaf)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4c542b7..a6cf4da 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,6 +62,17 @@
)
}
+ if (config.fabric_switches != null) {
+ stage("Reserve IPs for fabric switches") {
+ for(int i=0; i < config.fabric_switches.size(); i++) {
+ def str = createMACIPbindingStr(i+1,
+ "${config.fabric_switches[i].mac}",
+ "${config.fabric_switches[i].ip}")
+ sh "echo $str >> maas/roles/maas/files/dhcpd.reservations"
+ }
+ }
+ }
+
stage ("Fetch CORD packages") {
sh "vagrant ssh -c \"cd /opt/cord/build; ./gradlew fetch\" corddev"
}
@@ -130,31 +141,6 @@
}
if (config.fabric_switches != null) {
- stage("Reserve IPs for fabric switches and restart maas-dhcp service") {
- for(int i=0; i < config.fabric_switches.size(); i++) {
- def append = "";
- if (i!=0) {
- append = "-a";
- }
- def str = createMACIPbindingStr(i+1,
- "${config.fabric_switches[i].mac}",
- "${config.fabric_switches[i].ip}")
- runCmd("${config.head.ip}",
- "${config.head.user}",
- "${config.head.pass}",
- "echo -e $str '|' sudo tee $append /etc/dhcp/dhcpd.reservations > /dev/null")
- }
- runCmd("${config.head.ip}",
- "${config.head.user}",
- "${config.head.pass}",
- "sudo restart maas-dhcpd")
-
- runCmd("${config.head.ip}",
- "${config.head.user}",
- "${config.head.pass}",
- "cord harvest go")
- }
-
stage ("Wait for fabric switches to get deployed") {
for(int i=0; i < config.fabric_switches.size(); i++) {
runFabricCmd("${config.head.ip}",