Mercurial Mercurial > annotation-dashboard / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct deploy scripts
authorymh <ymh.work@gmail.com>
Fri, 14 Sep 2018 22:07:56 +0200
changeset 1 66f388fa2130
parent 0 5f4fcbc80b37
child 2 f72ffe8b30b1
correct deploy scripts
.hgignore file | annotate | diff | comparison | revisions
deploy/deploy.sh file | annotate | diff | comparison | revisions
deploy/deploy.yml file | annotate | diff | comparison | revisions
deploy/group_vars/explorunivers_test.yml file | annotate | diff | comparison | revisions
deploy/hosts/hosts.explorunivers_test file | annotate | diff | comparison | revisions
server/isso/requirements.txt file | annotate | diff | comparison | revisions 
--- a/.hgignore	Fri Sep 14 17:57:34 2018 +0200
+++ b/.hgignore	Fri Sep 14 22:07:56 2018 +0200
@@ -4,6 +4,8 @@
 .venv$
 .vagrant$
 ^deploy/deploy_vars.yml$
+^deploy/.*\.retry$
+^deploy/build$
 ^deploy/hosts$
 ^deploy/host_vars$
 ^deploy/hosts.dev$
--- a/deploy/deploy.sh	Fri Sep 14 17:57:34 2018 +0200
+++ b/deploy/deploy.sh	Fri Sep 14 22:07:56 2018 +0200
@@ -31,6 +31,6 @@
 
 pushd "$SCRIPTPATH"
 
-ansible-playbook -v -i "./hosts.$DASHBOARDNAME" -l "$DASHBOARDNAME" ./deploy.yml --extra-vars "dashboard_version=${VERSION}" --ask-vault-pass
+ansible-playbook -v -i "./hosts/hosts.$DASHBOARDNAME" -l "$DASHBOARDNAME" ./deploy.yml --extra-vars "dashboard_version=${VERSION}" --step --ask-vault-pass
 
 popd
--- a/deploy/deploy.yml	Fri Sep 14 17:57:34 2018 +0200
+++ b/deploy/deploy.yml	Fri Sep 14 22:07:56 2018 +0200
@@ -1,38 +1,37 @@
 ---
-- hosts: all
-  tasks:
-    - name: Print some debug information 
-      vars: 
-        msg: |
-            Module Variables ("vars"):
-            --------------------------------
-            {{ vars | to_nice_json }} 
+# - hosts: all
+#   tasks:
+#     - name: Print some debug information 
+#       vars: 
+#         msg: |
+#             Module Variables ("vars"):
+#             --------------------------------
+#             {{ vars | to_nice_json }} 
 
-            Environment Variables ("environment"):
-            --------------------------------
-            {{ environment | to_nice_json }} 
+#             Environment Variables ("environment"):
+#             --------------------------------
+#             {{ environment | to_nice_json }} 
 
-            GROUP NAMES Variables ("group_names"):
-            --------------------------------
-            {{ group_names | to_nice_json }}
+#             GROUP NAMES Variables ("group_names"):
+#             --------------------------------
+#             {{ group_names | to_nice_json }}
 
-            GROUPS Variables ("groups"):
-            --------------------------------
-            {{ groups | to_nice_json }}
+#             GROUPS Variables ("groups"):
+#             --------------------------------
+#             {{ groups | to_nice_json }}
 
-            HOST Variables ("hostvars"):
-            --------------------------------
-            {{ hostvars | to_nice_json }} 
+#             HOST Variables ("hostvars"):
+#             --------------------------------
+#             {{ hostvars | to_nice_json }} 
 
-      debug: 
-        msg: "{{ msg.split('\n') }}"       
-      tags: debug_info
+#       debug: 
+#         msg: "{{ msg.split('\n') }}"       
+#       tags: debug_info
 #
 # Localhost actions
 #
 - hosts: localhost
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
+  connection: local
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     dashboard_build_dir: "{{playbook_dir}}/build/tmp/dashboard"
@@ -101,8 +100,6 @@
 # all actions
 #
 - hosts: remote_discussions
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     dashboard_build_dir: "{{playbook_dir}}/build/tmp/dashboard"
@@ -121,8 +118,7 @@
 # Localhost actions
 #
 - hosts: localhost
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
+  connection: local
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     dashboard_build_dir: "{{playbook_dir}}/build/tmp/dashboard"
@@ -165,8 +161,6 @@
 #
 - hosts: remote_static
   become: yes
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     dashboard_build_dir: "{{playbook_dir}}/build/tmp/dashboard"
@@ -213,8 +207,6 @@
 #
 - hosts: remote_annotations_api:remote_discussions
   become: yes
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     clientjs_dir: "{{playbook_dir}}/../clientjs"
@@ -246,8 +238,6 @@
 #
 - hosts: remote_annotations_api
   become: yes
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     clientjs_dir: "{{playbook_dir}}/../clientjs"
@@ -332,9 +322,6 @@
 
   become: yes
 
-  vars_files:
-    - "{{playbook_dir}}/deploy_vars.yml"
-
   vars:
     isso_build_dir: "{{playbook_dir}}/build/tmp/isso"
     dashboard_build_dir: "{{playbook_dir}}/build/tmp/dashboard"
--- a/deploy/group_vars/explorunivers_test.yml	Fri Sep 14 17:57:34 2018 +0200
+++ b/deploy/group_vars/explorunivers_test.yml	Fri Sep 14 22:07:56 2018 +0200
@@ -1,5 +1,6 @@
 ---
-dashboard_repo: "git@dev.iri.centrepompidou.fr:dev/annotation-dashboard-nextleap"
+# dashboard_repo: "git@dev.iri.centrepompidou.fr:dev/annotation-dashboard-nextleap"
+dashboard_repo: "/Users/ymh/dev/projects/episteme/annotation-dashboard"
 dashboard_name: "annotation-dashboard-explorunivers"
 
 # note : must not end with /
--- a/deploy/hosts/hosts.explorunivers_test	Fri Sep 14 17:57:34 2018 +0200
+++ b/deploy/hosts/hosts.explorunivers_test	Fri Sep 14 22:07:56 2018 +0200
@@ -1,3 +1,6 @@
+[explorunivers_test]
+localhost
+
 [explorunivers_test:children]
 remote_static
 remote_annotations_api
--- a/server/isso/requirements.txt	Fri Sep 14 17:57:34 2018 +0200
+++ b/server/isso/requirements.txt	Fri Sep 14 22:07:56 2018 +0200
@@ -1,3 +1,3 @@
 # Note: the following line must be kept as a comment
-#-e git+https://github.com/IRI-Research/isso.git@21676d876356a05c7151f7f78f391b81fe1980e1#egg=isso
+#-e git+https://github.com/IRI-Research/isso.git@b1bf22de6130d6cc643b1a092e19b64412abfac6#egg=isso
 uwsgi
annotation-dashboard