commit 66ceea49e55c1e796d961b23134f224c1503a4bb
author Andy Bavier <andy@onlab.us> Wed Jul 26 09:06:00 2017 -0700
committer Andy Bavier <andy@onlab.us> Wed Jul 26 12:00:25 2017 -0700
tree ced03b461297a2872fbd3a052e0bc88d4e488fff
parent a10094b2a1e13d442634540434c1ed11e35f2ee7

Add pull_docker_registry

Change-Id: I5a5f93d4a58c5e495994679155e9224e4da59847

build.gradle

diff --git a/build.gradle b/build.gradle
index 13da3df..5cf2f92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -205,8 +205,8 @@
   executable = "ansible-playbook"
   args = [ "-i", "../genconfig/cord-inv",
     "--extra-vars", "@../genconfig/config.yml",
-    "--extra-vars", "deploy_docker_tag="+targetTag,
-    "--extra-vars", "deploy_docker_registry=docker-registry:5000/",
+    "--extra-vars", "pull_docker_tag="+targetTag,
+    "--extra-vars", "pull_docker_registry=docker-registry:5000/",
     "cord-config-playbook.yml" ]
 }
 
@@ -248,8 +248,8 @@
   executable = "ansible-playbook"
   args = [ "-i", "../genconfig/cord-inv",
     "--extra-vars", "@../genconfig/config.yml",
-    "--extra-vars", "deploy_docker_tag="+targetTag,
-    "--extra-vars", "deploy_docker_registry=docker-registry:5000/",
+    "--extra-vars", "pull_docker_tag="+targetTag,
+    "--extra-vars", "pull_docker_registry=docker-registry:5000/",
     "deploy-openstack-playbook.yml" ]
 }
 
@@ -259,13 +259,13 @@
   executable = "ansible-playbook"
   args = [ "-i", "../genconfig/cord-inv",
     "--extra-vars", "@../genconfig/config.yml",
-    "--extra-vars", "deploy_docker_tag="+targetTag,
-    "--extra-vars", "deploy_docker_registry=docker-registry:5000/",
+    "--extra-vars", "pull_docker_tag="+targetTag,
+    "--extra-vars", "pull_docker_registry=docker-registry:5000/",
     "deploy-onos-playbook.yml" ]
 }
 
 task PIdeployXOS (type: Exec) {
-  def extra_vars = "--extra-vars deploy_docker_tag="+targetTag+" --extra-vars deploy_docker_registry=docker-registry:5000/"
+  def extra_vars = "--extra-vars pull_docker_tag="+targetTag+" --extra-vars pull_docker_registry=docker-registry:5000/"
   def ansible_cmd = "cd /opt/cord/build/platform-install; ansible-playbook -i inventory/head-localhost --extra-vars @/opt/cord/build/genconfig/config.yml "+extra_vars+" launch-xos-playbook.yml"
 
   executable = "ssh"