From 6e89b93c7d8ac52fed7f284c171393d75f82f421 Mon Sep 17 00:00:00 2001
From: jygaulier <gaulier@alchemy.fr>
Date: Wed, 10 Jan 2018 15:09:30 +0100
Subject: [PATCH] PHRAS-1765 (#2398)

bump es to 2.3.3
---
 Vagrantfile                                             | 9 +++++++--
 resources/ansible/roles/elasticsearch/defaults/main.yml | 2 +-
 resources/ansible/roles/elasticsearch/tasks/main.yml    | 2 +-
 resources/ansible/roles/php/tasks/pecl.yml              | 3 +++
 resources/ansible/roles/rabbitmq/tasks/main.yml         | 1 +
 resources/ansible/vars/all.yml                          | 9 +++++----
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 0221742083..d0623e4eb8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -46,7 +46,12 @@ end
 
 # By default, the name of the VM is the project's directory name
 $hostname = File.basename($root).downcase
-$hostIps = `ip addr show | grep inet | grep -v inet6 | cut -d' ' -f6 | cut -d'/' -f1`.split("\n");
+if which('ip')
+    # $hostIps = `ip addr show | grep inet | grep -v inet6 | cut -d' ' -f6 | cut -d'/' -f1`.split("\n");
+    $hostIps = `ip addr show | sed -nE 's/[[:space:]]*inet ([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})(.*)$/\\1/p'`.split("\n");
+else
+    $hostIps = `ifconfig | sed -nE 's/[[:space:]]*inet ([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})(.*)$/\\1/p'`.split("\n");
+end
 
 Vagrant.configure("2") do |config|
 
@@ -103,5 +108,5 @@ Vagrant.configure("2") do |config|
        # config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"]
     end
 
-    config.vm.synced_folder "./", "/vagrant", type: "nfs"
+    config.vm.synced_folder "./", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'fsc']
 end
diff --git a/resources/ansible/roles/elasticsearch/defaults/main.yml b/resources/ansible/roles/elasticsearch/defaults/main.yml
index 5be3fd70d5..e42ca24fae 100644
--- a/resources/ansible/roles/elasticsearch/defaults/main.yml
+++ b/resources/ansible/roles/elasticsearch/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-elasticsearch_url: https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{ elasticsearch.version }}.deb
+elasticsearch_url: https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/{{ elasticsearch.version }}/elasticsearch-{{ elasticsearch.version }}.deb
\ No newline at end of file
diff --git a/resources/ansible/roles/elasticsearch/tasks/main.yml b/resources/ansible/roles/elasticsearch/tasks/main.yml
index c869f754d2..02d05ff121 100644
--- a/resources/ansible/roles/elasticsearch/tasks/main.yml
+++ b/resources/ansible/roles/elasticsearch/tasks/main.yml
@@ -36,7 +36,7 @@
   sudo: yes
 
 - name: Install plugins
-  shell: /usr/share/elasticsearch/bin/plugin install {{ item.name }}/{{ item.version }}
+  shell: /usr/share/elasticsearch/bin/plugin install {{ item.name }}
   when: not is_installed
   with_items: "{{ elasticsearch.plugins }}"
 
diff --git a/resources/ansible/roles/php/tasks/pecl.yml b/resources/ansible/roles/php/tasks/pecl.yml
index d8edc0fcc2..3dcbce1ebb 100644
--- a/resources/ansible/roles/php/tasks/pecl.yml
+++ b/resources/ansible/roles/php/tasks/pecl.yml
@@ -2,6 +2,9 @@
   apt: pkg="php5.6-dev" state=present
   when: php.pecl_packages is defined
 
+- name: Update pecl chennel
+  shell: pecl channel-update pecl.php.net
+
 - name: Install Package
   shell: echo "\n\n\n\n\n\n\n\n\n" | pecl install {{ item.package }}
   register: pecl_result
diff --git a/resources/ansible/roles/rabbitmq/tasks/main.yml b/resources/ansible/roles/rabbitmq/tasks/main.yml
index d40d466728..00f02fa971 100755
--- a/resources/ansible/roles/rabbitmq/tasks/main.yml
+++ b/resources/ansible/roles/rabbitmq/tasks/main.yml
@@ -20,6 +20,7 @@
   apt: pkg={{ item }} state=latest allow_unauthenticated=yes
   with_items:
     - rabbitmq-server
+    - librabbitmq1
     - librabbitmq-dev
 
 - name: Enable management plugin
diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml
index 5389921726..2f8f7cfe26 100644
--- a/resources/ansible/vars/all.yml
+++ b/resources/ansible/vars/all.yml
@@ -50,9 +50,9 @@ mariadb:
 elasticsearch:
     install: '1'
     port: '9200'
-    version: '1.7.3'
+    version: '2.3.3'
     plugins:
-        - {name: 'elasticsearch/elasticsearch-analysis-icu', version: '2.7.0'}
+        - {name: 'analysis-icu'}
 php:
     install: '1'
     ppa: php
@@ -76,8 +76,9 @@ php:
         - 'php5.6-bcmath'
         - 'php-pear'
     pecl_packages:
-        - {name: zmq, package: zmq-beta}
-        - {name: amqp, package: amqp-1.4.0}
+        - {name: zmq, package: php-zmq}
+        - {name: amqp, package: amqp-1.9.3}
+
 xdebug:
     install: '1'
     idekey: 'PHPSTORM'