From d63a6025658877bc611614e28f8e350e20d43246 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 15 Feb 2016 16:08:39 -0500
Subject: [PATCH] Import ansible-role-nginx into OpenStack

Change-Id: Id9c4f591eb5e6e19aeea263e3a8f24cb778aacbe
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .gitreview         |  4 ++++
 handlers/main.yaml |  4 ++--
 tasks/main.yaml    |  6 +++---
 tox.ini            | 42 ++++++++++++++++++++++++------------------
 4 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 .gitreview

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..11470a8
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/ansible-role-nginx.git
diff --git a/handlers/main.yaml b/handlers/main.yaml
index b610486..0e05257 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -13,11 +13,11 @@
 # under the License.
 ---
 - name: Validate nginx
+  become: yes
   shell: /usr/sbin/nginx -t -c /etc/nginx/nginx.conf
-  sudo: yes
 
 - name: Restart nginx
+  become: yes
   service:
     name: nginx
     state: restarted
-  sudo: yes
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 77b2d92..404c9b1 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -16,10 +16,10 @@
   include_vars: "{{ ansible_os_family }}.yaml"
 
 - include: install.yaml
-  sudo: yes
+  become: yes
 
 - include: config.yaml
-  sudo: yes
+  become: yes
 
 - include: service.yaml
-  sudo: yes
+  become: yes
diff --git a/tox.ini b/tox.ini
index c2f82cf..c3add41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,16 @@
 [tox]
-minversion = 1.6
-envlist = ansible-lint,docs,pep8
+minversion = 1.4.2
+envlist = docs,linters
 skipsdist = True
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
-[testenv:ansible-lint]
-setenv =
-  ANSIBLE_CONFIG = tests/ansible.cfg
-whitelist_externals = bash
-commands =
-  bash -c "find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
-    ansible-lint"
-  bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
-    ansible-playbook --syntax-check -i tests/inventory \
-    -e rolename=$(basename $(pwd)) > /dev/null"
+[testenv:docs]
+commands = python setup.py build_sphinx
 
-[testenv:ansible-functional]
+[testenv:functional]
 commands =
   ansible-playbook -i tests/inventory tests/test.yaml
 passenv = HOME
@@ -26,11 +18,25 @@ setenv =
   ANSIBLE_CONFIG = {toxinidir}/tests/ansible.cfg
   PYTHONUNBUFFERED = 1
 
-[testenv:docs]
-commands = python setup.py build_sphinx
-
-[testenv:pep8]
-commands = flake8
+[testenv:linters]
+setenv =
+  ANSIBLE_CONFIG = tests/ansible.cfg
+whitelist_externals = bash
+commands =
+  flake8
+  bash -c "find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
+    ansible-lint"
+  bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
+    ansible-playbook --syntax-check -i tests/inventory \
+    -e rolename=$(basename $(pwd)) > /dev/null"
 
 [testenv:venv]
 commands = {posargs}
+
+[flake8]
+# E123, E125 skipped as they are invalid PEP-8.
+
+show-source = True
+ignore = E123,E125
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build