Merge "Fail when ansible-galaxy returns error"

ansible-role-requirements.yml

@@ -2,6 +2,14 @@
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
   version: master
+- name: pip_install
+  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
+  scm: git
+  version: master
+- name: pip_lock_down
+  src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
+  scm: git
+  version: master
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
@@ -85,14 +93,6 @@
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
   version: master
-- name: pip_lock_down
-  src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
-  scm: git
-  version: master
-- name: pip_install
-  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  scm: git
-  version: master
 - name: plugins
   src: https://git.openstack.org/openstack/openstack-ansible-plugins
   path: /etc/ansible

scripts/bootstrap-ansible.sh

@@ -86,7 +86,6 @@ pip2 install $PIP_OPTS "${ANSIBLE_WORKING_DIR}" || pip install $PIP_OPTS "${ANSI
 if [ -f "${ANSIBLE_ROLE_FILE}" ];then
     # Pull all required roles.
     ansible-galaxy install --role-file=${ANSIBLE_ROLE_FILE} \
-                           --ignore-errors \
                            --force
 fi
 

tox.ini

@@ -82,7 +82,6 @@ commands =
     ansible-galaxy install \
       --role-file={envtmpdir}/ansible/ansible-role-requirements.yml \
       --roles-path={envtmpdir}/ansible/roles \
-      --ignore-errors \
       --force; \
     ansible-playbook -i 'localhost ansible-connection=local,' \
       --syntax-check \
@@ -99,4 +98,4 @@ commands =
   {[testenv:bashate]commands}
   {[testenv:ansible-lint]commands}
   {[testenv:ansible-syntax]commands}
-  {[testenv:inventory]commands}
+  {[testenv:inventory]commands}