From 60c43ece935fed99c6af10c74368e1cb8a4fbca0 Mon Sep 17 00:00:00 2001 From: Xavier Rousset Date: Wed, 10 Jan 2018 19:42:33 +0100 Subject: [PATCH] PHRAS-1790 Export repository url on vars, fix rabbitmq issue --- resources/ansible/playbook.yml | 1 + resources/ansible/roles/app/tasks/main.yml | 4 +- .../roles/elasticsearch/tasks/main.yml | 4 +- .../ansible/roles/mariadb/tasks/main.yml | 10 ----- resources/ansible/roles/php/tasks/main.yml | 9 ++-- .../ansible/roles/rabbitmq/tasks/main.yml | 18 +------- .../ansible/roles/repositories/tasks/main.yml | 41 +++++++++++++++++++ resources/ansible/vars/all.yml | 5 +++ 8 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 resources/ansible/roles/repositories/tasks/main.yml diff --git a/resources/ansible/playbook.yml b/resources/ansible/playbook.yml index 244e635f0d..6ad46de8f0 100644 --- a/resources/ansible/playbook.yml +++ b/resources/ansible/playbook.yml @@ -5,6 +5,7 @@ - vars/all.yml roles: - server + - repositories - vagrant_local - nginx - mariadb diff --git a/resources/ansible/roles/app/tasks/main.yml b/resources/ansible/roles/app/tasks/main.yml index a63736a229..ff5d55aa23 100644 --- a/resources/ansible/roles/app/tasks/main.yml +++ b/resources/ansible/roles/app/tasks/main.yml @@ -39,12 +39,12 @@ - name: Create extra databox become: yes become_user: vagrant - shell: 'bin/console databox:create db_alt admin@{{ hostname }}.vb' + shell: 'bin/console databox:create {{ mariadb.alt_databox_db }} admin@{{ hostname }}.vb' args: chdir: /vagrant/ - name: Enable debugger for host IP addresses - shell: bin/setup system:config add debugger.allowed-ips "{{ item}}" + shell: bin/setup system:config add debugger.allowed-ips "{{ item }}" with_items: '{{ host_addresses }}' args: chdir: /vagrant/ diff --git a/resources/ansible/roles/elasticsearch/tasks/main.yml b/resources/ansible/roles/elasticsearch/tasks/main.yml index 02d05ff121..c42c14f1c2 100644 --- a/resources/ansible/roles/elasticsearch/tasks/main.yml +++ b/resources/ansible/roles/elasticsearch/tasks/main.yml @@ -1,4 +1,5 @@ --- +# Watch repositories task to retrieve repository add - name: Check Elastic Search installation shell: apt-cache policy elasticsearch | grep -Po 'Installed:\s(.*)' | cut -d' ' -f 2; changed_when: false @@ -7,9 +8,6 @@ - name: Set installed variable set_fact: is_installed='{{ install_status.stdout == elasticsearch.version }}' -- name: Add dependencies repository - apt_repository: repo='ppa:webupd8team/java' update_cache=yes - - name: Set dependencies License shell: echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections changed_when: false diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml index 0fbc016ca1..c9f13322ca 100644 --- a/resources/ansible/roles/mariadb/tasks/main.yml +++ b/resources/ansible/roles/mariadb/tasks/main.yml @@ -3,16 +3,6 @@ - shell: hostname register: current_hostname - -- name: Add MariaDB-Repository - sudo: yes - apt_repository: repo='deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present - register: mariadb_repository - -- name: Add Key for MariaDB Repository - sudo: yes - apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcbcb082a1bb943db - - name: Update apt sudo: yes apt: update_cache=yes diff --git a/resources/ansible/roles/php/tasks/main.yml b/resources/ansible/roles/php/tasks/main.yml index a97f88e498..30c51aa34b 100644 --- a/resources/ansible/roles/php/tasks/main.yml +++ b/resources/ansible/roles/php/tasks/main.yml @@ -1,11 +1,8 @@ --- -- name: Add ppa Repository +# Watch repositories task to retrieve repository add +- name: Install php5.6 sudo: yes - apt_repository: repo=ppa:ondrej/{{ php.ppa }} update_cache=yes - -- name: Install php5 - sudo: yes - apt: pkg=php5 state=latest + apt: pkg=php5.6 state=latest - name: Install php5.6-fpm sudo: yes diff --git a/resources/ansible/roles/rabbitmq/tasks/main.yml b/resources/ansible/roles/rabbitmq/tasks/main.yml index 00f02fa971..d309f2c4d0 100755 --- a/resources/ansible/roles/rabbitmq/tasks/main.yml +++ b/resources/ansible/roles/rabbitmq/tasks/main.yml @@ -1,26 +1,10 @@ --- -- name: Add package repository - sudo: yes - shell: echo 'deb http://www.rabbitmq.com/debian/ testing main' > /etc/apt/sources.list.d/rabbitmq.list - -- name: Install package repository key - sudo: yes - shell: wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc && apt-key add rabbitmq-signing-key-public.asc - -- name: Remove signing key - sudo: yes - shell: rm rabbitmq-signing-key-public.asc - -- name: Update apt - sudo: yes - apt: update_cache=yes - +# Watch repositories task to retrieve repository add - name: Install server and libraries sudo: yes apt: pkg={{ item }} state=latest allow_unauthenticated=yes with_items: - rabbitmq-server - - librabbitmq1 - librabbitmq-dev - name: Enable management plugin diff --git a/resources/ansible/roles/repositories/tasks/main.yml b/resources/ansible/roles/repositories/tasks/main.yml new file mode 100644 index 0000000000..2c00cef1e7 --- /dev/null +++ b/resources/ansible/roles/repositories/tasks/main.yml @@ -0,0 +1,41 @@ +--- +# PHP +- name: Add ppa Repository + sudo: yes + apt_repository: repo={{ repositories.php }} update_cache=yes + +# Elasticsearch +- name: Add dependencies repository + apt_repository: repo={{ repositories.elasticsearch }} update_cache=yes + +# MariaDB +- name: Add MariaDB-Repository + sudo: yes + apt_repository: repo='{{ repositories.mariadb }} {{ ansible_distribution_release }} main' state=present + register: mariadb_repository + +- name: Add Key for MariaDB Repository + sudo: yes + apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcbcb082a1bb943db + +# RabbitMQ +- name: Add rabbitmq package repository + sudo: yes + shell: echo {{ repositories.rabbitmq }} > /etc/apt/sources.list.d/rabbitmq.list + +- name: Install rabbitmq package repository + sudo: yes + shell: wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc + +- name: Install rabbitmq package repository key + sudo: yes + shell: apt-key add rabbitmq-signing-key-public.asc + +- name: Remove signing key + sudo: yes + shell: rm rabbitmq-signing-key-public.asc + +# Update APT +- name: Update apt + sudo: yes + apt: update_cache=yes \ No newline at end of file diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml index 2f8f7cfe26..f8b797a1f2 100644 --- a/resources/ansible/vars/all.yml +++ b/resources/ansible/vars/all.yml @@ -27,6 +27,11 @@ server: - fr_FR.UTF-8 - de_DE.UTF-8 - nl_NL.UTF-8 +repositories: + php: 'ppa:ondrej/php' + mariadb: 'deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu' + elasticsearch: 'ppa:webupd8team/java' + rabbitmq: 'deb http://www.rabbitmq.com/debian/ testing main' vagrant_local: install: '1' vm: