commit ecfbd4d4948a4b03a55716e556a15070b4e3fa10
author David K. Bainbridge <dbainbri@ciena.com> Mon Nov 14 13:18:39 2016 -0800
committer David Bainbridge <dbainbri@ciena.com> Tue Nov 15 10:09:48 2016 -0800
tree 982cd29480506126d324660c67890e5cb7fcfcd3
parent db5c8c767b5c0df9b1921516bc9e106ad1a56676

CORD-616 make sure that platform can install via tunnel and some clean up

Change-Id: I3ce86a41e17135bad00305eb1e419544ae7fc912

build.gradle

diff --git a/build.gradle b/build.gradle
index db86e6d..3b8f645 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,29 +40,38 @@
     // Upstream registry to simplify filling out the comps table below
     upstreamReg = project.hasProperty('upstreamReg') ? project.getProperty('upstreamReg') : 'docker.io'
 
-    // Target registry to be used to publish docker images needed for deployment
-    targetReg = project.hasProperty('targetReg') ? project.getProperty('targetReg') : 'localhost:5000'
-
-    // The tag used to tag the docker images push to the target registry
-    targetTag = project.hasProperty('targetTag') ? project.getProperty('targetTag') : 'candidate'
-
-    // Component table
-    comps = [
-    ]
-
     // Deployment target config file (yaml format); this can be overwritten from the command line
     // using the -PdeployConfig=<file-path> syntax.
     deployConfig = project.hasProperty('deployConfig') ? project.getProperty('deployConfig') : './config/default.yml'
 
+    println "Using deployment config: $deployConfig"
+    File configFile = new File(deployConfig)
+    def yaml = new Yaml()
+    config = yaml.load(configFile.newReader())
+
+
+    // Target registry to be used to publish docker images needed for deployment
+    targetReg = project.hasProperty('targetReg')
+        ? project.getProperty('targetReg')
+        : config.docker && config.docker.registry
+            ? config.docker.registry
+            : 'localhost:5000'
+
+    // The tag used to tag the docker images push to the target registry
+    targetTag = project.hasProperty('targetTag')
+        ? project.getProperty('targetTag')
+        : config.docker && config.docker.imageVersion
+            ? config.docker.imageVersion
+            : 'candidate'    
+
+    println "targetReg = $targetReg, targetTag = $targetTag"
+
+    // Component table
+    comps = [
+    ]
 }
 
 task copyAnsibleInventory(type: Copy) {
-    inputs.file deployConfig
-
-    File configFile = new File(deployConfig)
-    def yaml = new Yaml()
-    def config = yaml.load(configFile.newReader())
-
     from 'inventory/templates/single-prod'
     into 'inventory'
     expand([
@@ -79,14 +88,6 @@
 task prime {
     // TODO this is a place-holder.
     // dependsOn updateDocker
-    doFirst {
-        println "Using deployment config: $deployConfig"
-        File configFile = new File(deployConfig)
-        def yaml = new Yaml()
-        def config = yaml.load(configFile.newReader())
-        println "Config: $config"
-        println "Access some data in config:\n\tSeed server IP=${config.seedServer.ip}"
-    }
 }
 
 // ---------------- Useful tasks ----------------
@@ -144,11 +145,6 @@
 task deployPlatform (type: Exec) {
     dependsOn copyAnsibleInventory
 
-    println "Using deployment config: $deployConfig"
-    File configFile = new File(deployConfig)
-    def yaml = new Yaml()
-    def config = yaml.load(configFile.newReader())
-
     executable = "ansible-playbook"
     args = ["-i", "inventory/single-prod"]
 
@@ -184,10 +180,8 @@
             .p(config.otherServers.role, "prov_role")
     }
 
-    if (config.docker) {
-        extraVars = extraVars.p(config.docker.registry, "docker_registry")
-            .p(config.docker.imageVersion, "docker_image_version")
-    }
+    extraVars = extraVars.p("$targetReg", "deploy_docker_registry")
+        .p("$targetTag", "deploy_docker_tag")
 
     def skipTags = [].p(config.seedServer.skipTags)
 
@@ -197,11 +191,6 @@
 task deploySingle (type: Exec) {
     dependsOn copyAnsibleInventory
 
-    println "Using deployment config: $deployConfig"
-    File configFile = new File(deployConfig)
-    def yaml = new Yaml()
-    def config = yaml.load(configFile.newReader())
-
     executable = "ansible-playbook"
     args = ["-i", "inventory/single-prod"]
 
@@ -237,10 +226,8 @@
             .p(config.otherServers.role, "prov_role")
     }
 
-    if (config.docker) {
-        extraVars = extraVars.p(config.docker.registry, "docker_registry")
-            .p(config.docker.imageVersion, "docker_image_version")
-    }
+    extraVars = extraVars.p("$targetReg", "deploy_docker_registry")
+        .p("$targetTag", "deploy_docker_tag")
 
     def skipTags = [].p(config.seedServer.skipTags)
 
@@ -250,11 +237,6 @@
 task postDeployTests (type: Exec) {
     dependsOn copyAnsibleInventory
 
-    println "Using deployment config: $deployConfig"
-    File configFile = new File(deployConfig)
-    def yaml = new Yaml()
-    def config = yaml.load(configFile.newReader())
-
     executable = "ansible-playbook"
     args = ["-i", "inventory/single-prod"]
 
@@ -290,10 +272,8 @@
             .p(config.otherServers.role, "prov_role")
     }
 
-    if (config.docker) {
-        extraVars = extraVars.p(config.docker.registry, "docker_registry")
-            .p(config.docker.imageVersion, "docker_image_version")
-    }
+    extraVars = extraVars.p("$targetReg", "deploy_docker_registry")
+        .p("$targetTag", "deploy_docker_tag")
 
     def skipTags = [].p(config.seedServer.skipTags)