Merge pull request #3 from singleplatform-eng/Upstream_changes

Upstream changes

Author: sp-lyang

.travis.yml

@@ -2,54 +2,34 @@
 
 language: python
 python: "2.7"
+sudo: required
+dist: trusty
 services:
   - docker
 
 env:
-  global:
-    - ROLE_GLOBALS="postgresql_shared_buffers=32MB"
   matrix:
-    - ROLE_OPTIONS="postgresql_version=9.1" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.2" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.3" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.4" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.5" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.6" ANSIBLE_VERSION="1.9.4"
-    - ROLE_OPTIONS="postgresql_version=9.1" ANSIBLE_VERSION="2.1.2.0"
-    - ROLE_OPTIONS="postgresql_version=9.2" ANSIBLE_VERSION="2.1.2.0"
-    - ROLE_OPTIONS="postgresql_version=9.3" ANSIBLE_VERSION="2.1.2.0"
-    - ROLE_OPTIONS="postgresql_version=9.4" ANSIBLE_VERSION="2.1.2.0"
-    - ROLE_OPTIONS="postgresql_version=9.5" ANSIBLE_VERSION="2.1.2.0"
-    - ROLE_OPTIONS="postgresql_version=9.6" ANSIBLE_VERSION="2.1.2.0"
-
-before_install:
-  # Remove the PostgreSQL installed by Travis
-  - sudo apt-get purge pgdg-keyring '^postgresql.*' -y
-  - sudo apt-get autoremove -y -qq
-  - sudo rm -rf /etc/postgresql
-  - sudo rm -rf /var/lib/postgresql
-  - sudo rm -f /etc/apt/sources.list.d/pgdg-source.list
-  # Install some dependencies
-  - sudo apt-get update -qq -y
-  - sudo apt-get install -qq -y python-apt python-pycurl locales
-  - echo 'en_US.UTF-8 UTF-8' | sudo tee /var/lib/locales/supported.d/local
+    - IMAGE_NAME="ubuntu-upstart:14.04"
+    - IMAGE_NAME="ubuntu:16.04-builded"
+    - IMAGE_NAME="debian:8-builded"
+    - IMAGE_NAME="debian:9-builded"
+    - IMAGE_NAME="centos:7-builded"
+    - IMAGE_NAME="centos:6-builded"
 
 install:
-  - pip install ansible=="$ANSIBLE_VERSION"
+  - pip install ansible=="2.4.2.0" docker-py
+  - ln -s ${PWD} tests/docker/ANXS.postgresql
 
 script:
-  - echo localhost > inventory
-
   # Syntax check
-  - ansible-playbook -i inventory tests/playbook.yml --syntax-check
+  - ansible-playbook -i tests/docker/hosts -e image_name=${IMAGE_NAME} tests/docker/site.yml --syntax-check
 
   # Play test
-  - ansible-playbook -i inventory tests/playbook.yml --connection=local --sudo -e "$ROLE_GLOBALS $ROLE_OPTIONS"
+  - ansible-playbook -i tests/docker/hosts -e image_name=${IMAGE_NAME} tests/docker/site.yml
 
   # Idempotence test
-  - ansible-playbook -i inventory tests/playbook.yml --connection=local --sudo -e "$ROLE_GLOBALS $ROLE_OPTIONS" > idempotence_out
+  - ansible-playbook -i tests/docker/hosts -e image_name=${IMAGE_NAME} tests/docker/site.yml > idempotence_out
   - ./tests/idempotence_check.sh idempotence_out
 
-  # Testing with docker (experimental)
-  - docker build -f tests/Dockerfile-ubuntu14.04 -t postgres_ubuntu14.04 .
-  - docker build -f tests/Dockerfile-centos6     -t postgres_centos6     .
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -1,11 +1,16 @@
 ## ANXS - PostgreSQL [![Build Status](https://travis-ci.org/ANXS/postgresql.svg?branch=master)](https://travis-ci.org/ANXS/postgresql)
 
+---
+Help Wanted! If you are able and willing to help maintain this Ansible role then please open a GitHub issue. A lot of people seem to use this role and we (quite obviously) need assistance!
+💖
+---
+
 Ansible role which installs and configures PostgreSQL, extensions, databases and users.
 
 
 #### Installation
 
-This has been tested on Ansible 1.9.4 and higher.
+This has been tested on Ansible 2.4.0 and higher.
 
 To install:
 
@@ -18,11 +23,25 @@ ansible-galaxy install ANXS.postgresql
 - ANXS.monit ([Galaxy](https://galaxy.ansible.com/list#/roles/502)/[GH](https://github.com/ANXS/monit)) if you want monit protection (in that case, you should set `monit_protection: true`)
 
 
+#### Compatibility matrix
+| Distribution / PostgreSQL | <= 9.2 | 9.3 | 9.4 | 9.5 | 9.6 |
+| ------------------------- |:------:|:---:|:---:|:---:|:---:|
+| Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+| Ubuntu 16.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+| Debian 9.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+| Centos 6.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+| Centos 7.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
+
+- :white_check_mark: - tested, works fine
+- :interrobang: - maybe works, not tested
+- :no_entry: - PostgreSQL has reached EOL
+
 #### Variables
 
 ```yaml
 # Basic settings
-postgresql_version: 9.3
+postgresql_version: 9.6
 postgresql_encoding: 'UTF-8'
 postgresql_locale: 'en_US.UTF-8'
 postgresql_ctype: 'en_US.UTF-8'

Vagrantfile

@@ -8,20 +8,21 @@ Vagrant.configure('2') do |config|
   config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key'
 
   config.vm.define 'anxs' do |machine|
-    machine.vm.box = "bento/ubuntu-16.04"
+    #machine.vm.box = "bento/ubuntu-16.04"
     # machine.vm.box = "ubuntu/trusty64"
     #machine.vm.box = "ubuntu/precise64"
     #machine.vm.box = "debian/jessie64"
     #machine.vm.box = "debian/wheezy64"
-    #machine.vm.box = "chef/centos-7.1"
-    #machine.vm.box = "chef/centos-6.6"
+    machine.vm.box = "centos/7"
+    #machine.vm.box = "centos/6"
 
     machine.vm.network :private_network, ip: '192.168.88.22'
     machine.vm.hostname = 'anxs.local'
 
     machine.vm.provision 'ansible' do |ansible|
       ansible.playbook = 'tests/playbook.yml'
-      ansible.sudo = true
+      ansible.verbose = "v"
+      ansible.become = true
       ansible.inventory_path = 'vagrant-inventory'
       ansible.host_key_checking = false
     end

ansible.cfg

@@ -1,2 +1,3 @@
 [defaults]
-roles_path = ../
+roles_path = ../
+allow_world_readable_tmpfiles = True