CORD-229 - updated to implement initial base switch provisioning
Change-Id: I3deca583dc2753e1a2c77629f1ee45f8b66223c8
diff --git a/build.gradle b/build.gradle
index 86c0888..ed2d757 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,8 +28,6 @@
deployConfig = project.hasProperty('deployConfig') ? project.getProperty('deployConfig') : './config/default.yml'
dockerPath = project.hasProperty('dockerPath') ? project.getProperty('dockerPath') : '/usr/bin'
-
- vboxUser = project.hasProperty('vboxUser') ? project.getProperty('vboxUser') : 'cord'
}
// Switch Configuration Image
@@ -227,14 +225,10 @@
.p(config.seedServer.fabric_network, "fabric_network")
.p(config.seedServer.fabric_iface, "fabric_iface")
.p(config.seedServer.domain, "domain")
- }
-
- if (config.seedServer.port) {
- extraVars = extraVars.p(config.seedServer.port, "ansible_ssh_port")
- }
-
- if (vboxUser != "") {
- extraVars = extraVars.p(vboxUser, "power_helper_user")
+ .p(config.seedServer.virtualbox_support, "virtualbox_support")
+ .p(config.seedServer.power_helper_user, "power_helper_user")
+ .p(config.seedServer.power_helper_host, "power_helper_host")
+ .p(config.seedServer.port, "ansible_ssh_port")
}
if (config.otherServers) {
@@ -282,16 +276,10 @@
.p(config.seedServer.fabric_network, "fabric_network")
.p(config.seedServer.fabric_iface, "fabric_iface")
.p(config.seedServer.domain, "domain")
+ .p(config.seedServer.virtualbox_support, "virtualbox_support")
.p(config.seedServer.power_helper_user, "power_helper_user")
.p(config.seedServer.power_helper_host, "power_helper_host")
- }
-
- if (config.seedServer.port) {
- extraVars = extraVars.p(config.seedServer.port, "ansible_ssh_port")
- }
-
- if (vboxUser != "") {
- extraVars = extraVars.p(vboxUser, "power_helper_user")
+ .p(config.seedServer.port, "ansible_ssh_port")
}
if (config.otherServers) {