openstack/openstack-ansible-os_sahara
Code Issues Proposed changes

Merge "use include_tasks instead of include"

Browse Source
This commit is contained in:
Zuul 2018-09-08 21:22:22 +00:00 committed by Gerrit Code Review
commit 41bdfdb798
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/main.yml
View File

@ -23,23 +23,23 @@
tags:
- always
- include: sahara_pre_install.yml
- include_tasks: sahara_pre_install.yml
tags:
- sahara-install
- include: sahara_install.yml
- include_tasks: sahara_install.yml
tags:
- sahara-install
- include: sahara_post_install.yml
- include_tasks: sahara_post_install.yml
tags:
- sahara-config
- include: sahara_uwsgi.yml
- include_tasks: sahara_uwsgi.yml
tags:
- sahara-config
- include: sahara_init_common.yml
- include_tasks: sahara_init_common.yml
tags:
- sahara-config
@ -63,12 +63,12 @@
- common-mq
- sahara-config
- include: sahara_db_setup.yml
- include_tasks: sahara_db_setup.yml
when: inventory_hostname == groups['sahara_all'][0]
tags:
- sahara-config
- include: sahara_service_setup.yml
- include_tasks: sahara_service_setup.yml
when: inventory_hostname == groups['sahara_all'][0]
tags:
- sahara-config

2
tasks/sahara_init_common.yml
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: sahara_init_systemd.yml
- include_tasks: sahara_init_systemd.yml
when:
- ansible_service_mgr == 'systemd'

12
tests/test.yml
View File

@ -14,19 +14,19 @@
# limitations under the License.
# Setup the host
- include: common/test-setup-host.yml
- import_playbook: common/test-setup-host.yml
# Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml
- import_playbook: common/test-install-infra.yml
# Install Keystone
- include: common/test-install-keystone.yml
- import_playbook: common/test-install-keystone.yml
# Install Nova
- include: common/test-install-nova.yml
- import_playbook: common/test-install-nova.yml
# Install Sahara
- include: common/test-install-sahara.yml
- import_playbook: common/test-install-sahara.yml
# Install and execute Tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml