Merge pull request #14 from palantirnet/feature/solr

Adds solr role to ansible playbook
palantirnet · Sep 28, 2016 · bc837c2 · bc837c2
2 parents 497d355 + be0250d
commit bc837c2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile
@@ -20,7 +20,7 @@ Vagrant.configure(2) do |config|
     config.vm.define "#{project}" do |box|
 
         box.vm.box = "palantir/drupalbox"
-        box.vm.box_version = ">= 0.0.6, < 1.0.0"
+        box.vm.box_version = ">= 0.1.1, < 1.0.0"
 
         box.vm.provider "vmware_fusion" do |v|
             v.vmx["memsize"] = "2048"

diff --git a/conf/vagrant/provisioning/drupal8-skeleton.yml b/conf/vagrant/provisioning/drupal8-skeleton.yml
@@ -3,10 +3,12 @@
   vars:
     timezone: America/Chicago
     mysql_root_pass: root
+    solr_enabled: false
     system_packages: ["php5-gd"]
   roles:
     - { role: common }
     - { role: php }
     - { role: vhost }
+    - { role: solr }
     - { role: drush }
     - { role: gulp }
diff --git a/conf/vagrant/provisioning/roles/solr/defaults/main.yml b/conf/vagrant/provisioning/roles/solr/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+solr_enabled: false
diff --git a/conf/vagrant/provisioning/roles/solr/tasks/main.yml b/conf/vagrant/provisioning/roles/solr/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+
+- name: Solr | Disable Jetty Service
+  become: yes
+  service:
+    name: jetty
+    state: started
+    enabled: yes
+  when: solr_enabled == True
+  tags: solr