Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use external roles #43

Merged
merged 3 commits into from
Jan 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :ansible do |ansible|
ansible.playbook = "playbook.yml"
ansible.galaxy_role_file = "requirements.yml"
ansible.galaxy_command = "ansible-galaxy install --role-file=%{role_file} --roles-path=roles/external --force"
ansible.galaxy_command = "ansible-galaxy install --role-file=%{role_file} --roles-path=roles/external"
ansible.limit = "all"
ansible.inventory_path = "inventory/vagrant"
ansible.host_vars = {
Expand Down
11 changes: 6 additions & 5 deletions crayfish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
become: yes

roles:
- apache
- php
- git
- composer
- crayfish
- geerlingguy.apache
- geerlingguy.php
- geerlingguy.git
- geerlingguy.composer
- Islandora-Devops.crayfish

4 changes: 2 additions & 2 deletions database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
when: claw_db is not defined

roles:
- role: mysql
- role: geerlingguy.mysql
when: claw_db == 'mysql'
- role: postgresql
- role: geerlingguy.postgresql
when: claw_db == 'pgsql'
6 changes: 3 additions & 3 deletions karaf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
become: yes

roles:
- karaf
- apix
- alpaca
- Islandora-Devops.karaf
- Islandora-Devops.apix
- Islandora-Devops.alpaca
67 changes: 56 additions & 11 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,88 @@
- src: geerlingguy.apache
name: apache
version: 2.1.1

- src: geerlingguy.php
name: php
version: 3.5.0

- src: geerlingguy.composer
name: composer
version: 1.6.1

- src: geerlingguy.git
name: git
version: 1.4.0

- src: geerlingguy.mysql
name: mysql
version: 2.8.0

- src: geerlingguy.postgresql
name: postgresql
version: 1.3.1

- src: geerlingguy.solr
name: solr
version: 3.6.3

- src: geerlingguy.java
name: java
version: 1.7.4

- src: geerlingguy.drupal
name: drupal
version: 2.4.0

- src: geerlingguy.drush
name: drush
version: 2.0.1

- src: geerlingguy.drupal-console
name: drupal-console
version: 1.1.0

- src: https://github.com/Islandora-Devops/ansible-role-activemq
name: Islandora-Devops.activemq
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-alpaca
name: Islandora-Devops.alpaca
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-apix
name: Islandora-Devops.apix
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-blazegraph
name: Islandora-Devops.blazegraph
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-cantaloupe
name: Islandora-Devops.cantaloupe
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-crayfish
name: Islandora-Devops.crayfish
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-drupal-openseadragon
name: Islandora-Devops.drupal-openseadragon
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-fcrepo
name: Islandora-Devops.fcrepo
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-fcrepo-syn
name: Islandora-Devops.fcrepo-syn
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-tomcat8
name: Islandora-Devops.tomcat8
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-fits
name: Islandora-Devops.fits
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-grok
name: Islandora-Devops.grok
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-karaf
name: Islandora-Devops.karaf
version: 0.0.1

- src: https://github.com/Islandora-Devops/ansible-role-keymaster
name: Islandora-Devops.keymaster
version: 0.0.1
6 changes: 0 additions & 6 deletions roles/internal/activemq/defaults/main.yml

This file was deleted.

19 changes: 0 additions & 19 deletions roles/internal/activemq/meta/main.yml

This file was deleted.

33 changes: 0 additions & 33 deletions roles/internal/activemq/tasks/install.yml

This file was deleted.

12 changes: 0 additions & 12 deletions roles/internal/activemq/tasks/main.yml

This file was deleted.

8 changes: 0 additions & 8 deletions roles/internal/activemq/tasks/user.yml

This file was deleted.

15 changes: 0 additions & 15 deletions roles/internal/activemq/templates/activemq.service.j2

This file was deleted.

30 changes: 0 additions & 30 deletions roles/internal/alpaca/defaults/main.yml

This file was deleted.

45 changes: 0 additions & 45 deletions roles/internal/alpaca/tasks/compile.yml

This file was deleted.

7 changes: 0 additions & 7 deletions roles/internal/alpaca/tasks/config.yml

This file was deleted.

20 changes: 0 additions & 20 deletions roles/internal/alpaca/tasks/deploy.yml

This file was deleted.

17 changes: 0 additions & 17 deletions roles/internal/alpaca/tasks/main.yml

This file was deleted.

4 changes: 0 additions & 4 deletions roles/internal/alpaca/templates/alpaca.cfg.j2

This file was deleted.

6 changes: 0 additions & 6 deletions roles/internal/alpaca/templates/maven.xml.j2

This file was deleted.

19 changes: 0 additions & 19 deletions roles/internal/apix/defaults/main.yml

This file was deleted.

Loading