Merge pull request #34 from migibert/restore_v2

Let role v1.x.y deal with Orient v2, we will soon release the 2.x.y v…
migibert · Oct 23, 2019 · dbf78e7 · dbf78e7
2 parents ddd5144 + b8824b9
commit dbf78e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -25,11 +25,12 @@ Take a look at default variables to have an idea of a complete configuration.
 orientdb_autoback_delay: Delay time for auto backups. Default is 4h.
 orientdb_autoback: Enables auto backup. Default is False.
 orientdb_autoback_start: Start time for auto backup. Default is 23:00:00.
-orientdb_version: OrientDB server version. Default value is 2.0.1.
+orientdb_version: OrientDB server version. Default value is 2.2.36.
+orientdb_url: URL used to retrieve OrientDB archive. Default value is "https://s3.us-east-2.amazonaws.com/orientdb3/releases/{{orientdb_version}}/orientdb-community-{{orientdb_version}}.tar.gz"
 orientdb_user: System user, OrientDB directories owner. Default value is orientdb.
 orientdb_user_password: Hashed value of orientdb_user password. Default value is hashed 'orientdb' : $6$Ls2PCtO6PLby08$Hkh36Sn2V112FSexIHM25dHpnU2P1TflCQbj./e6kf3Pd.25s41uZu9dkeZSU7Ixy4fq.U8PSd6/FzjmSz3An/
 orientdb_dir: Installation directory. Default is /opt
-orientdb_path: Installation path, used by server scripts for $ORIENTDB_HOME definition. Default value is '{{orientdb_dir}}/orientdb-community-{{orientdb_version}}'
+orientdb_path: Installation path, used by server scripts for $ORIENTDB_HOME definition. Default value is '{{orientdb_dir}}/orientdb-{{orientdb_version}}'
 orientdb_log_dir: Log directory for orientdb server.
 orientdb_bind_ip: Server ip to bind. Default value is 0.0.0.0
 orientdb_enable_binary: Enables binary communication with server. Default value is True

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,8 +2,8 @@
 orientdb_autoback_delay: 4h
 orientdb_autoback: False
 orientdb_autoback_start: 23:00:00
-orientdb_version: 3.0.23
-orientdb_url: https://s3.us-east-2.amazonaws.com/orientdb3/releases/{{orientdb_version}}/orientdb-{{orientdb_version}}.tar.gz
+orientdb_version: 2.2.36
+orientdb_url: "https://s3.us-east-2.amazonaws.com/orientdb3/releases/{{orientdb_version}}/orientdb-community-{{orientdb_version}}.tar.gz"
 orientdb_user: orientdb
 orientdb_user_password: $6$Ls2PCtO6PLby08$Hkh36Sn2V112FSexIHM25dHpnU2P1TflCQbj./e6kf3Pd.25s41uZu9dkeZSU7Ixy4fq.U8PSd6/FzjmSz3An/
 orientdb_dir: /opt

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,4 +1,9 @@
 ---
+- name: Prerequisites
+  fail:
+    msg: Versions 1.x of this role cannot handle OrientDB version > 2 installations.
+  when: orientdb_version[:1] | int > 2
+
 - name: Create orientdb user
   user: name={{orientdb_user}} password={{orientdb_user_password}}
 

diff --git a/tests/example.yml b/tests/example.yml
@@ -4,11 +4,11 @@
     orientdb_autoback_delay: 4h
     orientdb_autoback: False
     orientdb_autoback_start: 23:00:00
-    orientdb_version: 3.0.23
+    orientdb_version: 2.2.36
     orientdb_user: orientdb
     orientdb_user_password: $6$Ls2PCtO6PLby08$Hkh36Sn2V112FSexIHM25dHpnU2P1TflCQbj./e6kf3Pd.25s41uZu9dkeZSU7Ixy4fq.U8PSd6/FzjmSz3An/
     orientdb_dir: /opt
-    orientdb_path: '{{orientdb_dir}}/orientdb-{{orientdb_version}}'
+    orientdb_path: '{{orientdb_dir}}/orientdb-community-{{orientdb_version}}'
     orientdb_log_d  : /var/log/orientdb
     orientdb_bind_ip: 0.0.0.0
     orientdb_enable_binary: True