From bf2ab28e587be5d86a276217490a6591962d9a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Helleboid?= Date: Thu, 8 Nov 2018 23:53:10 +0100 Subject: Add .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..58411a3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +test/main.retry +test/roles/* +!test/roles/ansible-postgresql-role -- cgit v1.2.3 From b91d73415f453ef39faf9824601b3fbeecceb4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Helleboid?= Date: Thu, 8 Nov 2018 23:53:30 +0100 Subject: Update README fix barman and postgres galaxy names --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f07f2d4..1a83a08 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This role has been tested on Ansible 2.3.0 and higher. To install: ``` -ansible-galaxy install trainline-eu.postgresql +ansible-galaxy install trainline-eu.ansible_postgresql_role ``` @@ -18,7 +18,7 @@ ansible-galaxy install trainline-eu.postgresql No dependencies Recommended dependencies: -- trainline-eu.barman +- trainline-eu.ansible_barman_role #### Compatibility matrix -- cgit v1.2.3 From c4606fce8ff23842250eff18f285ed9e38b98a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Helleboid?= Date: Thu, 8 Nov 2018 23:52:14 +0100 Subject: Fix CI --- .travis.yml | 3 ++- test/hosts | 1 + test/main.yml | 4 ++-- test/requirements.yml | 3 +++ test/roles/ansible-postgresql-role | 1 + test/roles/postgresql | 1 - 6 files changed, 9 insertions(+), 4 deletions(-) create mode 120000 test/roles/ansible-postgresql-role delete mode 120000 test/roles/postgresql diff --git a/.travis.yml b/.travis.yml index 1ffbc33..7a72289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,11 @@ install: - pip install ansible # Check ansible version - ansible --version + - ansible-galaxy install -r test/requirements.yml -p test/roles/ script: # Basic role syntax check - - ansible-playbook test/main.yml -i test --syntax-check + - ansible-playbook test/main.yml -i test/hosts --syntax-check notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/test/hosts b/test/hosts index e69de29..2302eda 100644 --- a/test/hosts +++ b/test/hosts @@ -0,0 +1 @@ +localhost ansible_connection=local diff --git a/test/main.yml b/test/main.yml index 19ff526..3224833 100644 --- a/test/main.yml +++ b/test/main.yml @@ -132,7 +132,7 @@ postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" pre_tasks: *pre_tasks roles: - - { role: postgresql, tags: ['postgres'] } + - { role: ansible-postgresql-role, tags: ['postgres'] } tasks: - name: Start postgres cluster service: name=postgresql state=started @@ -151,4 +151,4 @@ postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" pre_tasks: *pre_tasks roles: - - { role: postgresql, tags: ['postgres'] } + - { role: ansible-postgresql-role, tags: ['postgres'] } diff --git a/test/requirements.yml b/test/requirements.yml index 1b1155c..4c72838 100644 --- a/test/requirements.yml +++ b/test/requirements.yml @@ -1,3 +1,6 @@ - src: chrismeyersfsu.provision_docker name: provision_docker version: 7a6243dfcf69f9d262877eca487bc14b62ba6960 +- src: trainline-eu.ansible_barman_role + name: barman + version: 1.0.0 diff --git a/test/roles/ansible-postgresql-role b/test/roles/ansible-postgresql-role new file mode 120000 index 0000000..af2d79b --- /dev/null +++ b/test/roles/ansible-postgresql-role @@ -0,0 +1 @@ +../../../ansible-postgresql-role \ No newline at end of file diff --git a/test/roles/postgresql b/test/roles/postgresql deleted file mode 120000 index f47fac4..0000000 --- a/test/roles/postgresql +++ /dev/null @@ -1 +0,0 @@ -../../../postgresql \ No newline at end of file -- cgit v1.2.3