openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

use include_tasks instead of include

Browse Source 
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: Ieff641e85a61b596f8a3a96820e1842d91f8f05c
This commit is contained in:
ZhijunWei 2018-08-19 12:06:06 -04:00
parent 27e13f58a2
commit 2fe69b9735
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/neutron_install.yml
View File

@ -72,7 +72,7 @@
('need_db_expand' not in ansible_local['openstack_ansible']['neutron']) or ('need_db_expand' not in ansible_local['openstack_ansible']['neutron']) or
('need_db_contract' not in ansible_local['openstack_ansible']['neutron']) ('need_db_contract' not in ansible_local['openstack_ansible']['neutron'])
- include: neutron_selinux.yml - include_tasks: neutron_selinux.yml
when: when:
- ansible_selinux.status == "enabled" - ansible_selinux.status == "enabled"

2
tasks/providers/opendaylight_config.yml
View File

@ -40,5 +40,5 @@
- opendaylight-install - opendaylight-install
- opendaylight-pip-packages - opendaylight-pip-packages
- include: setup_ovs_opendaylight.yml - include_tasks: setup_ovs_opendaylight.yml
when: neutron_services['neutron-server']['group'] not in group_names when: neutron_services['neutron-server']['group'] not in group_names

6
tests/benchmark-upgrade.yml
View File

@ -13,8 +13,8 @@
# 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: test-neutron-resources-upgrade.yml - import_playbook: test-neutron-resources-upgrade.yml
- include: common/test-install-neutron.yml - import_playbook: common/test-install-neutron.yml
- include: test-neutron-resources-results.yml - import_playbook: test-neutron-resources-results.yml

8
tests/test-install-previous-neutron.yml
View File

@ -13,10 +13,10 @@
# 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: common/setting-nodepool-variables.yml - import_playbook: common/setting-nodepool-variables.yml
# Ensure the repo is setup for previous version # Ensure the repo is setup for previous version
- include: common/previous/test-repo-setup.yml - import_playbook: common/previous/test-repo-setup.yml
- name: Make /lib/modules accessible on neutron_agent containers - name: Make /lib/modules accessible on neutron_agent containers
hosts: neutron_agent hosts: neutron_agent
@ -85,11 +85,11 @@
when: when:
- inventory_hostname in groups['neutron_all'] - inventory_hostname in groups['neutron_all']
- ansible_pkg_mgr in ['yum', 'dnf'] - ansible_pkg_mgr in ['yum', 'dnf']
- include: common/ensure-rabbitmq.yml - include_tasks: common/ensure-rabbitmq.yml
vhost_name: "{{ neutron_rabbitmq_vhost }}" vhost_name: "{{ neutron_rabbitmq_vhost }}"
user_name: "{{ neutron_rabbitmq_userid }}" user_name: "{{ neutron_rabbitmq_userid }}"
user_password: "{{ neutron_rabbitmq_password }}" user_password: "{{ neutron_rabbitmq_password }}"
- include: common/create-grant-db.yml - include_tasks: common/create-grant-db.yml
db_name: "{{ neutron_galera_database }}" db_name: "{{ neutron_galera_database }}"
db_password: "{{ neutron_container_mysql_password }}" db_password: "{{ neutron_container_mysql_password }}"
roles: roles:

10
tests/test-upgrade.yml
View File

@ -14,18 +14,18 @@
# limitations under the License. # limitations under the License.
# Setup the user ssh keys, host and containers # Setup the user ssh keys, host and containers
- include: common/test-setup-host.yml - import_playbook: common/test-setup-host.yml
# Install haproxy # Install haproxy
- include: common/test-install-haproxy.yml - import_playbook: common/test-install-haproxy.yml
# Install RabbitMQ/MariaDB # Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml - import_playbook: common/test-install-infra.yml
# Install etcd # Install etcd
- include: common/test-install-etcd.yml - import_playbook: common/test-install-etcd.yml
when: when:
- groups['neutron_calico_dhcp_agent'] | length > 0 - groups['neutron_calico_dhcp_agent'] | length > 0
# Install Keystone # Install Keystone
- include: common/test-install-keystone.yml - import_playbook: common/test-install-keystone.yml

18
tests/test.yml
View File

@ -14,26 +14,26 @@
# limitations under the License. # limitations under the License.
# Setup the user ssh keys, host and containers # Setup the user ssh keys, host and containers
- include: common/test-setup-host.yml - import_playbook: common/test-setup-host.yml
# Install haproxy # Install haproxy
- include: common/test-install-haproxy.yml - import_playbook: common/test-install-haproxy.yml
# Install RabbitMQ/MariaDB # Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml - import_playbook: common/test-install-infra.yml
# Install etcd # Install etcd
- include: common/test-install-etcd.yml - import_playbook: common/test-install-etcd.yml
# Install Keystone # Install Keystone
- include: common/test-install-keystone.yml - import_playbook: common/test-install-keystone.yml
# Install Neutron # Install Neutron
- include: common/test-install-neutron.yml - import_playbook: common/test-install-neutron.yml
# Install and execute tempest # Install and execute tempest
- include: common/test-install-tempest.yml - import_playbook: common/test-install-tempest.yml
- include: test-calico-functional.yml - import_playbook: test-calico-functional.yml
- include: test-dragonflow-functional.yml - import_playbook: test-dragonflow-functional.yml