openstack
/
openstack-ansible-os_horizon
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: I969209a4205fac9e205439dc97a96ddf3ea53800
This commit is contained in:
caoyuan 2018-07-24 18:58:48 +08:00
parent e30ea49418
commit b60abe9573
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/horizon_ssl_self_signed.yml
View File

@ -13,11 +13,11 @@
# 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: horizon_ssl_key_create.yml - include_tasks: horizon_ssl_key_create.yml
when: inventory_hostname == groups['horizon_all'][0] when: inventory_hostname == groups['horizon_all'][0]
- include: horizon_ssl_key_store.yml - include_tasks: horizon_ssl_key_store.yml
when: inventory_hostname == groups['horizon_all'][0] when: inventory_hostname == groups['horizon_all'][0]
- include: horizon_ssl_key_distribute.yml - include_tasks: horizon_ssl_key_distribute.yml
when: inventory_hostname != groups['horizon_all'][0] when: inventory_hostname != groups['horizon_all'][0]

18
tasks/main.yml
View File

@ -39,25 +39,25 @@
tags: tags:
- always - always
- include: horizon_pre_install.yml - include_tasks: horizon_pre_install.yml
tags: tags:
- horizon-install - horizon-install
- include: horizon_install.yml - include_tasks: horizon_install.yml
tags: tags:
- horizon-install - horizon-install
- include: horizon_post_install.yml - include_tasks: horizon_post_install.yml
tags: tags:
- horizon-config - horizon-config
- include: horizon_db_setup.yml - include_tasks: horizon_db_setup.yml
static: no static: no
when: inventory_hostname == ansible_play_hosts[0] when: inventory_hostname == ansible_play_hosts[0]
tags: tags:
- horizon-config - horizon-config
- include: horizon_ssl_self_signed.yml - include_tasks: horizon_ssl_self_signed.yml
static: no static: no
when: when:
- not horizon_external_ssl | bool - not horizon_external_ssl | bool
@ -65,7 +65,7 @@
tags: tags:
- horizon-config - horizon-config
- include: horizon_ssl_user_provided.yml - include_tasks: horizon_ssl_user_provided.yml
static: no static: no
when: not horizon_external_ssl | bool when: not horizon_external_ssl | bool
tags: tags:
@ -80,7 +80,7 @@
- horizon-config - horizon-config
- horizon-ssl - horizon-ssl
- include: horizon_service_setup.yml - include_tasks: horizon_service_setup.yml
tags: tags:
- horizon-config - horizon-config
@ -114,11 +114,11 @@
tags: tags:
- horizon-config - horizon-config
- include: horizon_apache.yml - include_tasks: horizon_apache.yml
tags: tags:
- horizon-config - horizon-config
- include: horizon_translations_update.yml - include_tasks: horizon_translations_update.yml
when: horizon_translations_update | bool when: horizon_translations_update | bool
tags: tags:
- horizon-config - horizon-config

10
tests/test.yml
View File

@ -14,16 +14,16 @@
# 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 Horizon # Install Horizon
- include: common/test-install-horizon.yml - import_playbook: common/test-install-horizon.yml
# Install and execute Tempest # Install and execute Tempest
- include: common/test-install-tempest.yml - import_playbook: common/test-install-tempest.yml