From a9ff199983749742c71c862a060032cf70de645c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 29 May 2018 12:09:47 +0200 Subject: [PATCH] Add blazar base jobs This introduces the most basic jobs for blazar, and makes sure blazar passes lint tests. This reverts commit a5b35ebf116830f2b464714760c4ccd274b99d30, effectively re-enabling zuul jobs, and adapts the role to our latest standards (The lint tests were failing, as the passwords were logged while setting up Blazar server) Functional testing starts with -nv only. However, in this commit we added the necessary `rabbitmq_all` group to the infra1 group, to help further functional testing. Co-Authored-By: Taseer Ahmed Change-Id: Ic2560b53aebf69e4784ce56db6929fe010e6b11e --- README.rst | 4 +++- run_tests.sh | 0 tasks/blazar_service_setup.yml | 4 ++++ tests/inventory | 3 +++ zuul.d/project.yaml | 23 +++++++++++++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) mode change 100644 => 100755 run_tests.sh create mode 100644 zuul.d/project.yaml diff --git a/README.rst b/README.rst index 5e325fc..ca754f9 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,6 @@ OpenStack-Ansible Blazar ======================== -Ansible role that will install and configure Blazar, resource reservation for OpenStack. +Ansible role that will install and configure Blazar, a resource reservation service for OpenStack. +The documentation for the role can also be found at +``_ \ No newline at end of file diff --git a/run_tests.sh b/run_tests.sh old mode 100644 new mode 100755 diff --git a/tasks/blazar_service_setup.yml b/tasks/blazar_service_setup.yml index bcf3c3a..4987afd 100644 --- a/tasks/blazar_service_setup.yml +++ b/tasks/blazar_service_setup.yml @@ -29,6 +29,7 @@ until: add_service|success retries: 5 delay: 2 + no_log: true # Create an admin user - name: Ensure blazar user @@ -47,6 +48,7 @@ until: add_service|success retries: 5 delay: 10 + no_log: true # Add role to the user - name: Ensure blazar user to admin role @@ -65,6 +67,7 @@ until: add_service|success retries: 5 delay: 10 + no_log: true # Create an endpoint - name: Ensure blazar endpoint @@ -91,3 +94,4 @@ delay: 10 tags: - blazar-setup + no_log: true diff --git a/tests/inventory b/tests/inventory index bdd9a26..7caf062 100644 --- a/tests/inventory +++ b/tests/inventory @@ -13,6 +13,9 @@ infra1 [memcached_all] infra1 +[rabbitmq_all] +infra1 + [service_all:children] galera_all memcached_all diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml new file mode 100644 index 0000000..fcabb14 --- /dev/null +++ b/zuul.d/project.yaml @@ -0,0 +1,23 @@ +--- +# Copyright 2018, taseer94@gmail.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- project: + check: + jobs: + - openstack-ansible-linters + - openstack-ansible-functional-ubuntu-xenial-nv + gate: + jobs: + - openstack-ansible-linters