diff --git a/roles/6-generic-apps/meta/main.yml b/roles/6-generic-apps/meta/main.yml
index 8ba049a7..a6e27138 100644
--- a/roles/6-generic-apps/meta/main.yml
+++ b/roles/6-generic-apps/meta/main.yml
@@ -2,3 +2,4 @@ dependencies:
    - { role: mysql, tags: ['generic','mysql'], when: mysql_install }
    - { role: elgg, tags: ['generic','elgg'], when: elgg_install }
    - { role: owncloud, tags: ['generic','owncloud'], when: owncloud_install }
+   - { role: opensearchserver, tags: ['generic','opensearchserver'], when: oss_install }
diff --git a/roles/opensearchserver/README.rst b/roles/opensearchserver/README.rst
new file mode 100644
index 00000000..f9876fd4
--- /dev/null
+++ b/roles/opensearchserver/README.rst
@@ -0,0 +1,16 @@
+===============
+OpenSearchServer README
+===============
+
+Open-source enterprise class search engine software.
+
+http://www.opensearchserver.com
+
+After Installation
+------------------
+
+Locations
+---------
+
+Parameters
+----------
diff --git a/roles/opensearchserver/defaults/main.yml b/roles/opensearchserver/defaults/main.yml
new file mode 100644
index 00000000..1878e71d
--- /dev/null
+++ b/roles/opensearchserver/defaults/main.yml
@@ -0,0 +1,3 @@
+oss_url: /oss
+oss_install: True
+oss_enabled: True
diff --git a/roles/opensearchserver/tasks/install.yml b/roles/opensearchserver/tasks/install.yml
new file mode 100644
index 00000000..1d5e7f11
--- /dev/null
+++ b/roles/opensearchserver/tasks/install.yml
@@ -0,0 +1,29 @@
+- name: Get the OpenSearchServer software
+  command: wget -c -t 20 http://people.sugarlabs.org/anish/opensearchserver-1.5.12-b940.rpm -O {{ downloads_dir}}/opensearchserver.rpm
+  when: not {{ use_cache }} and not {{ no_network }}
+  tags:
+    - download2
+
+
+- name: Install the package
+  yum: name={{ downloads_dir}}/opensearchserver.rpm
+       state=present
+
+- name: Configure the server to run on port 9092 (as cockpit runs on port 9090 in fedora)
+  replace: dest='/etc/opensearchserver' regexp='SERVER_PORT=9090' replace='SERVER_PORT=9092'
+
+- name: Create OpenSearchServer service
+  template: backup=yes
+            src={{ item.src }}
+            dest={{ item.dest }}
+            owner=root
+            group=root
+            mode={{ item.mode }}
+  with_items:
+    - { src: 'opensearchserver.service.j2', dest: '/etc/systemd/system/opensearchserver.service', mode: '0655'}
+
+- name: Enable OpenSearchServer service
+  service: name=opensearchserver
+           enabled=yes
+           state=restarted
+  when: oss_enabled
diff --git a/roles/opensearchserver/tasks/main.yml b/roles/opensearchserver/tasks/main.yml
new file mode 100644
index 00000000..f50e8a43
--- /dev/null
+++ b/roles/opensearchserver/tasks/main.yml
@@ -0,0 +1,3 @@
+- name: OpenSearchServer will only install on x86_64
+  include: install.yml
+  when: ansible_userspace_architecture == "x86_64"
diff --git a/roles/opensearchserver/templates/opensearchserver.service.j2 b/roles/opensearchserver/templates/opensearchserver.service.j2
new file mode 100644
index 00000000..7998a667
--- /dev/null
+++ b/roles/opensearchserver/templates/opensearchserver.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenSearchServer daemon service
+After=syslog.target network.target local-fs.target
+
+[Service]
+Type=forking
+ExecStart=/bin/bash /etc/init.d/opensearchserver start
+ExecStop=/bin/bash /etc/init.d/opensearchserver stop
+ExecReload=/bin/bash /etc/init.d/opensearchserver restart
+
+[Install]
+WantedBy=multi-user.target