diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..75a0526
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,112 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+.vagrant
+*.iml
+archives
+.DS_Store
+ssh_keys
+ansible.log
+*.zip
+license.txt
+*.log
+*.tar.gz
+*.rpm
+*.tar
+ansible_fact_cache_dir
+*jar
+.ansible_cache*
+configs_and_logs
+redhat-rhui.repo
+rhui-load-balancers.conf
+out
+.idea
+*iml
+*retry
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1 @@
+---
diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..02fa9f6
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for opdk-setup-ps
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..0b5fc1d
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,169 @@
+galaxy_info:
+  author: your name
+  description: 
+  company: your company (optional)
+  
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+  
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+  
+  min_ansible_version: 1.2
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If travis integration is cofigured, only notification for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+  
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your
+  # platform on this list, let us know and we'll get it added!
+  #
+  #platforms:
+  #- name: EL
+  #  versions:
+  #  - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Solaris
+  #  versions:
+  #  - all
+  #  - 10
+  #  - 11.0
+  #  - 11.1
+  #  - 11.2
+  #  - 11.3
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #  - 23
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: IOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: eos
+  #  versions:
+  #  - all
+  #  - Any
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Junos
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 10.0
+  #  - 10.1
+  #  - 10.2
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #  - 9.3
+  #- name: Ubuntu
+  #  versions:
+  #  - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #  - wily
+  #  - xenial
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  #- name: NXOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Debian
+  #  versions:
+  #  - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy
+  
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is
+    # a keyword that describes and categorizes the role.
+    # Users find roles by searching for tags. Be sure to
+    # remove the '[]' above if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of
+    # alphanumeric characters. Maximum 20 tags per role.
+
+dependencies:
+- { role: opdk-setup-default-settings }
diff --git a/tasks/4150703-main.yml b/tasks/4150703-main.yml
new file mode 100644
index 0000000..d86ed43
--- /dev/null
+++ b/tasks/4150703-main.yml
@@ -0,0 +1,91 @@
+---
+
+- name: Status of Postgres Database Port
+  register: pg_db_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_db_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres External Managment Port
+  register: pg_ext_mgmt_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_ext_mgmt_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres Internal Management Port
+  register: pg_int_mgmt_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_int_mgmt_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres JMX Port
+  register: pg_jmx_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_jmx_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Setup Postgres
+  ignore_errors: yes
+  shell: "{{ apigee_installation_home }}/share/installer/apigee-setup.sh -f {{ opdk_installation_config_file }} -p ps"
+  when: pg_db_port_status | failed and pg_ext_mgmt_port_status | failed and pg_int_mgmt_port_status | failed and pg_jmx_port_status | failed
+
+- name: Status of Postgres Database Port
+  register: pg_db_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_db_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres External Managment Port
+  register: pg_ext_mgmt_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_ext_mgmt_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres Internal Management Port
+  register: pg_int_mgmt_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_int_mgmt_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Status of Postgres JMX Port
+  register: pg_jmx_port_status
+  ignore_errors: true
+  wait_for:
+    port: '{{ pg_jmx_port }}'
+    host: '{{ local_address }}'
+    timeout: 1
+
+- name: Postgres Database Port Failed
+  fail:
+    msg: "Postgres Database port failed to start"
+  when: pg_db_port_status | failed
+
+- name: Postgres External Management Port Failed
+  fail:
+    msg: "Message Processor External Management port failed to start"
+  when: not pg_ext_mgmt_port_status.state == 'started'
+
+- name: Qpid Internal Management Port Failed
+  fail:
+    msg: "Message Processor Internal Management port failed to start"
+  when: not pg_int_mgmt_port_status.state == 'started'
+
+- name: Qpid JMX Port startup failed
+  fail:
+    msg: "Message Processor JMX port failed to start"
+  when: not pg_jmx_port_status.state == 'started'
+
diff --git a/tasks/main.yml b/tasks/main.yml
new file mode 100644
index 0000000..8b2f44e
--- /dev/null
+++ b/tasks/main.yml
@@ -0,0 +1,17 @@
+---
+# tasks file for opdk-setup-ps
+- include: 4150703-main.yml
+  when: opdk_version | version_compare('4.16.01', '<')
+
+- name: Set permissions on pgdata folder
+  file:
+    path: '{{ apigee_postgresql_data_dir }}'
+    owner: '{{ opdk_user_name }}'
+    group: '{{ opdk_group_name }}'
+    mode: 0700
+    state: directory
+  when: opdk_version | version_compare('4.16.01', '>=')
+
+- name: Postgresql Server installation
+  shell: '{{ apigee_setup }} -p ps -f {{ opdk_installation_config_file }}'
+  when: opdk_version | version_compare('4.16.01', '>=')
diff --git a/tests/inventory b/tests/inventory
new file mode 100644
index 0000000..d18580b
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1 @@
+localhost
\ No newline at end of file
diff --git a/tests/test.yml b/tests/test.yml
new file mode 100644
index 0000000..3ade8a6
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - opdk-setup-ps
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
new file mode 100644
index 0000000..695a08d
--- /dev/null
+++ b/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for opdk-setup-ps