Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-17 10:24:55 +00:00 committed by Gerrit Code Review
commit 846bfaa8ca
3 changed files with 11 additions and 11 deletions

View File

@ -25,19 +25,19 @@
tags:
- always
- include: masakari_pre_install.yml
- include_tasks: masakari_pre_install.yml
tags:
- masakari-install
- include: masakari_install.yml
- include_tasks: masakari_install.yml
tags:
- masakari-install
- include: masakari_post_install.yml
- include_tasks: masakari_post_install.yml
tags:
- masakari-config
- include: masakari_init_common.yml
- include_tasks: masakari_init_common.yml
tags:
- masakari-config
@ -66,7 +66,7 @@
- "masakari_services['masakari-api']['group'] in group_names"
- "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]"
- include: masakari_service_setup.yml
- include_tasks: masakari_service_setup.yml
static: no
when:
- "masakari_services['masakari-api']['group'] in group_names"

View File

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

View File

@ -14,16 +14,16 @@
# 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 Masakari
- include: test-install-masakari.yml
- import_playbook: test-install-masakari.yml
# Test Masakari
- include: test-masakari-functional.yml
- import_playbook: test-masakari-functional.yml