Skip to content

Commit

Permalink
Change strategy for 'roles' directory testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
smcmahon committed Jul 14, 2016
1 parent 93f6b1e commit 4e4295a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 3 deletions.
7 changes: 7 additions & 0 deletions HISTORY.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Unreleased

- Symbolic link to self for testing fouled up vagrant on platforms without client extensions.
Change strategy to use ansible.cfg specification for roles.
[smcmahon]


1.2.9 2016-07-08

- Update to use Plone 5.0.5 as default.
Expand Down
3 changes: 3 additions & 0 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Used for Vagrant and CI testing
[defaults]
roles_path = ../
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---

ansible_ssh_pipelining: true

plone_version: '5.0.5'

plone_major_version: "{{ plone_version|truncate(3, killwords=true, end='') }}"
Expand Down
1 change: 0 additions & 1 deletion plone.plone_server

This file was deleted.

4 changes: 2 additions & 2 deletions test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@

roles:

- role: ./plone.plone_server
- role: plone.plone_server
plone_config: "{{ servers[0] }}"

- role: ./plone.plone_server
- role: plone.plone_server
plone_config: "{{ servers[1] }}"

tasks:
Expand Down

0 comments on commit 4e4295a

Please sign in to comment.