Revert "WIP: Modify playbook to use tripleo-quickstart-extras See: https://review.openstack.org/#/c/397700/"

This reverts commit da87ca0e55.

Change-Id: Ib31e7a465296868cccd854d02c3acc3bace49783
This commit is contained in:
Ronelle Landy 2016-11-17 11:25:24 -04:00
parent da87ca0e55
commit c735c6b455
1 changed files with 2 additions and 18 deletions

View File

@ -97,17 +97,11 @@
roles:
- overcloud-prep-network
- name: Prepare the SSL Configuration for the overcloud deployment
hosts: undercloud
gather_facts: no
roles:
- { role: overcloud-ssl, when: ssl_overcloud|bool }
- name: Deploy the overcloud
hosts: undercloud
gather_facts: no
roles:
- overcloud-deploy
- tripleo-overcloud
# Add the overcloud nodes to the generated inventory.
- name: Inventory the overcloud
@ -133,20 +127,10 @@
debug: var=overcloud_deploy_result
failed_when: overcloud_deploy_result == "failed"
# Validate the deployment
- name: validate the overcloud
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
roles:
- { role: validate-simple, when: test_ping|bool }
# Execute tempest against the overcloud deployment
- name: Execute tempest against the overcloud
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
roles:
- { role: validate-tempest, when: run_tempest|bool }
- tripleo-overcloud-validate