Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-09-16 04:27:45 +00:00 committed by Gerrit Code Review
commit 7dc384062c
9 changed files with 23 additions and 23 deletions

View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: test-install-memcached.yml
- import_playbook: test-install-memcached.yml
- include: test-install-rabbitmq.yml
- import_playbook: test-install-rabbitmq.yml
- include: test-install-galera.yml
- import_playbook: test-install-galera.yml

View File

@ -35,7 +35,7 @@
# config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain
# the load balancer back end for this container.
- include: common-tasks/haproxy-endpoint-manage.yml
- include_tasks: common-tasks/haproxy-endpoint-manage.yml
vars:
haproxy_state: disabled
when:
@ -46,7 +46,7 @@
# Now that container changes are done, we can set
# the load balancer back end for this container
# to available again.
- include: common-tasks/haproxy-endpoint-manage.yml
- include_tasks: common-tasks/haproxy-endpoint-manage.yml
vars:
haproxy_state: enabled
when:

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: setting-nodepool-variables.yml
- import_playbook: setting-nodepool-variables.yml
- name: Make /lib/modules accessible on neutron_agent containers
hosts: neutron_agent

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: setting-nodepool-variables.yml
- import_playbook: setting-nodepool-variables.yml
- name: Prepare for nova services
hosts: nova_all

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: test-setup-swifthosts.yml
- import_playbook: test-setup-swifthosts.yml
- name: Playbook for deploying swift
hosts: "{{ swift_groups | default('swift_all:swift_remote_all') }}"

View File

@ -23,9 +23,9 @@
become: yes
gather_facts: true
tasks:
- include: "common-tasks/test-set-nodepool-vars.yml"
- include_tasks: "common-tasks/test-set-nodepool-vars.yml"
- include: destroy_containers.yml
- import_playbook: destroy_containers.yml
when: destroy_first | default(True) | bool
- name: Playbook for creating containers
@ -62,7 +62,7 @@
remote_user: root
gather_facts: true
pre_tasks:
- include: "common-tasks/test-set-nodepool-vars.yml"
- include_tasks: "common-tasks/test-set-nodepool-vars.yml"
roles:
- role: "openstack_hosts"
vars_files:

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: test-repo-setup.yml
- import_playbook: test-repo-setup.yml
- name: Playbook for configuring hosts
hosts: localhost
@ -26,7 +26,7 @@
vars_files:
- test-vars.yml
tasks:
- include: "common-tasks/test-set-nodepool-vars.yml"
- include_tasks: "common-tasks/test-set-nodepool-vars.yml"
- name: Clear iptables rules
shell: "{{ playbook_dir }}/iptables-clear.sh"
@ -83,7 +83,7 @@
openrc_openstack_client_config_dir_owner: "root"
openrc_clouds_yml_file_owner: "root"
- include: test-install-openstack-hosts.yml
- import_playbook: test-install-openstack-hosts.yml
- name: Playbook for configuring the LXC host
hosts: localhost

View File

@ -14,10 +14,10 @@
# limitations under the License.
# Prepare the user ssh keys
- include: test-prepare-keys.yml
- import_playbook: test-prepare-keys.yml
# Prepare the host
- include: test-prepare-host.yml
- import_playbook: test-prepare-host.yml
# Prepare the containers
- include: test-prepare-containers.yml
- import_playbook: test-prepare-containers.yml

View File

@ -14,19 +14,19 @@
# limitations under the License.
# Prepare the user ssh keys
- include: common/test-prepare-keys.yml
- import_playbook: common/test-prepare-keys.yml
# Prepare the host
- include: common/test-prepare-host.yml
- import_playbook: common/test-prepare-host.yml
# Prepare the containers
- include: common/test-prepare-containers.yml
- import_playbook: common/test-prepare-containers.yml
# Install RabbitMQ/MariaDB/Memcached
- 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 Tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml