diff options
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | test/hosts | 1 | ||||
-rw-r--r-- | test/main.yml | 4 | ||||
-rw-r--r-- | test/requirements.yml | 3 | ||||
l--------- | test/roles/ansible-postgresql-role | 1 | ||||
l--------- | test/roles/postgresql | 1 |
8 files changed, 14 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..58411a3 --- /dev/null +++ b/.gitignore | |||
@@ -0,0 +1,3 @@ | |||
1 | test/main.retry | ||
2 | test/roles/* | ||
3 | !test/roles/ansible-postgresql-role | ||
diff --git a/.travis.yml b/.travis.yml index 1ffbc33..7a72289 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -16,10 +16,11 @@ install: | |||
16 | - pip install ansible | 16 | - pip install ansible |
17 | # Check ansible version | 17 | # Check ansible version |
18 | - ansible --version | 18 | - ansible --version |
19 | - ansible-galaxy install -r test/requirements.yml -p test/roles/ | ||
19 | 20 | ||
20 | script: | 21 | script: |
21 | # Basic role syntax check | 22 | # Basic role syntax check |
22 | - ansible-playbook test/main.yml -i test --syntax-check | 23 | - ansible-playbook test/main.yml -i test/hosts --syntax-check |
23 | 24 | ||
24 | notifications: | 25 | notifications: |
25 | webhooks: https://galaxy.ansible.com/api/v1/notifications/ | 26 | webhooks: https://galaxy.ansible.com/api/v1/notifications/ |
@@ -9,7 +9,7 @@ This role has been tested on Ansible 2.3.0 and higher. | |||
9 | To install: | 9 | To install: |
10 | 10 | ||
11 | ``` | 11 | ``` |
12 | ansible-galaxy install trainline-eu.postgresql | 12 | ansible-galaxy install trainline-eu.ansible_postgresql_role |
13 | ``` | 13 | ``` |
14 | 14 | ||
15 | 15 | ||
@@ -18,7 +18,7 @@ ansible-galaxy install trainline-eu.postgresql | |||
18 | No dependencies | 18 | No dependencies |
19 | 19 | ||
20 | Recommended dependencies: | 20 | Recommended dependencies: |
21 | - trainline-eu.barman | 21 | - trainline-eu.ansible_barman_role |
22 | 22 | ||
23 | #### Compatibility matrix | 23 | #### Compatibility matrix |
24 | 24 | ||
@@ -0,0 +1 @@ | |||
localhost ansible_connection=local | |||
diff --git a/test/main.yml b/test/main.yml index e1731ac..6258199 100644 --- a/test/main.yml +++ b/test/main.yml | |||
@@ -132,7 +132,7 @@ | |||
132 | postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" | 132 | postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" |
133 | pre_tasks: *pre_tasks | 133 | pre_tasks: *pre_tasks |
134 | roles: | 134 | roles: |
135 | - { role: postgresql, tags: ['postgres'] } | 135 | - { role: ansible-postgresql-role, tags: ['postgres'] } |
136 | tasks: | 136 | tasks: |
137 | - name: Start postgres cluster | 137 | - name: Start postgres cluster |
138 | service: name=postgresql state=started | 138 | service: name=postgresql state=started |
@@ -151,4 +151,4 @@ | |||
151 | postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" | 151 | postgres_listen_addresses: "{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}" |
152 | pre_tasks: *pre_tasks | 152 | pre_tasks: *pre_tasks |
153 | roles: | 153 | roles: |
154 | - { role: postgresql, tags: ['postgres'] } | 154 | - { 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 @@ | |||
1 | - src: chrismeyersfsu.provision_docker | 1 | - src: chrismeyersfsu.provision_docker |
2 | name: provision_docker | 2 | name: provision_docker |
3 | version: 7a6243dfcf69f9d262877eca487bc14b62ba6960 | 3 | version: 7a6243dfcf69f9d262877eca487bc14b62ba6960 |
4 | - src: trainline-eu.ansible_barman_role | ||
5 | name: barman | ||
6 | 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 @@ | |||
1 | ../../../postgresql \ No newline at end of file | ||