You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/02/02 19:43:17 UTC
airavata git commit: AIRAVATA-2305 Changing local deploy to assume already built distribution

Repository: airavata
Updated Branches:
  refs/heads/develop 59c812ba1 -> 4beadefdc


AIRAVATA-2305 Changing local deploy to assume already built distribution


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4beadefd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4beadefd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4beadefd

Branch: refs/heads/develop
Commit: 4beadefdccae4f5640562917a7589bf1384285f6
Parents: 59c812b
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Feb 2 14:42:58 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Feb 2 14:42:58 2017 -0500

----------------------------------------------------------------------
 dev-tools/ansible/group_vars/local.yml.template          | 1 -
 dev-tools/ansible/local_airavata_deploy.yml              | 2 +-
 dev-tools/ansible/roles/airavata_build/defaults/main.yml | 4 ----
 dev-tools/ansible/roles/airavata_build/tasks/main.yml    | 1 -
 dev-tools/ansible/roles/airavata_deploy/tasks/main.yml   | 2 +-
 5 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4beadefd/dev-tools/ansible/group_vars/local.yml.template
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/local.yml.template b/dev-tools/ansible/group_vars/local.yml.template
index 2f63a10..d7ff4e9 100644
--- a/dev-tools/ansible/group_vars/local.yml.template
+++ b/dev-tools/ansible/group_vars/local.yml.template
@@ -2,4 +2,3 @@
 
 airavata_source_dir: "/Users/machrist/Documents/Airavata/airavata"
 deployment_dir: "/Users/machrist/Documents/Airavata/LocalAiravata"
-do_git_pull: true

http://git-wip-us.apache.org/repos/asf/airavata/blob/4beadefd/dev-tools/ansible/local_airavata_deploy.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/local_airavata_deploy.yml b/dev-tools/ansible/local_airavata_deploy.yml
index e13f493..7327170 100644
--- a/dev-tools/ansible/local_airavata_deploy.yml
+++ b/dev-tools/ansible/local_airavata_deploy.yml
@@ -1,9 +1,9 @@
 ---
 
+# Assumption here is that develop has already built the Airavata distribution locally
 - hosts: local
   vars:
       server_deployment_dir: "{{ deployment_dir }}"
       server_name: all
   roles:
-      - airavata_build
       - airavata_deploy

http://git-wip-us.apache.org/repos/asf/airavata/blob/4beadefd/dev-tools/ansible/roles/airavata_build/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/airavata_build/defaults/main.yml b/dev-tools/ansible/roles/airavata_build/defaults/main.yml
deleted file mode 100644
index e1d3401..0000000
--- a/dev-tools/ansible/roles/airavata_build/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-# You might override this for local development
-do_git_pull: true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/4beadefd/dev-tools/ansible/roles/airavata_build/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/airavata_build/tasks/main.yml b/dev-tools/ansible/roles/airavata_build/tasks/main.yml
index 2c4653f..71c7c32 100644
--- a/dev-tools/ansible/roles/airavata_build/tasks/main.yml
+++ b/dev-tools/ansible/roles/airavata_build/tasks/main.yml
@@ -2,7 +2,6 @@
   git: repo={{ airavata_repo }}
        dest={{ airavata_source_dir }}
        version={{ git_branch }}
-  when: do_git_pull
   register: git_pull
 
 - name: check for existing distribution tarball

http://git-wip-us.apache.org/repos/asf/airavata/blob/4beadefd/dev-tools/ansible/roles/airavata_deploy/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/airavata_deploy/tasks/main.yml b/dev-tools/ansible/roles/airavata_deploy/tasks/main.yml
index bd8bfbd..c95903a 100644
--- a/dev-tools/ansible/roles/airavata_deploy/tasks/main.yml
+++ b/dev-tools/ansible/roles/airavata_deploy/tasks/main.yml
@@ -34,7 +34,7 @@
 - name: register the backup distribution
   find:
       paths: "{{ server_deployment_dir }}"
-      patterns: "{{ old_dist_dir }}bk"
+      patterns: "{{ old_airavata_dist }}bk"
       file_type: directory
   register: backup_dist_dir