openstack
/
openstack-ansible-os_sahara
Code Issues Proposed changes

use include_tasks instead of include 

include is marked as deprecated since ansible 2.4[0]

Switch to include_tasks or import_playbook as necessary

[0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated

Change-Id: Idf00933d271b5e80bda9113ccaa1f3bc71eb60c6
This commit is contained in:
ZhijunWei 2018-08-19 12:43:44 -04:00
parent 3cbb9a25cf
commit 55df48c58f
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: tags:
- always - always
- include: sahara_pre_install.yml - include_tasks: sahara_pre_install.yml
tags: tags:
- sahara-install - sahara-install
- include: sahara_install.yml - include_tasks: sahara_install.yml
tags: tags:
- sahara-install - sahara-install
- include: sahara_post_install.yml - include_tasks: sahara_post_install.yml
tags: tags:
- sahara-config - sahara-config
- include: sahara_uwsgi.yml - include_tasks: sahara_uwsgi.yml
tags: tags:
- sahara-config - sahara-config
- include: sahara_init_common.yml - include_tasks: sahara_init_common.yml
tags: tags:
- sahara-config - sahara-config
@ -63,12 +63,12 @@
- common-mq - common-mq
- sahara-config - sahara-config
- include: sahara_db_setup.yml - include_tasks: sahara_db_setup.yml
when: inventory_hostname == groups['sahara_all'][0] when: inventory_hostname == groups['sahara_all'][0]
tags: tags:
- sahara-config - sahara-config
- include: sahara_service_setup.yml - include_tasks: sahara_service_setup.yml
when: inventory_hostname == groups['sahara_all'][0] when: inventory_hostname == groups['sahara_all'][0]
tags: tags:
- sahara-config - sahara-config

2
tasks/sahara_init_common.yml
View File

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

12
tests/test.yml
View File

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