Merge "Use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-17 04:06:41 +00:00 committed by Gerrit Code Review
commit 0574b9c845
5 changed files with 15 additions and 15 deletions

View File

@ -45,20 +45,20 @@
tags:
- always
- include: watcher_pre_install.yml
- include_tasks: watcher_pre_install.yml
tags:
- watcher-install
- include: watcher_install.yml
- include_tasks: watcher_install.yml
tags:
- watcher-install
- include: watcher_post_install.yml
- include_tasks: watcher_post_install.yml
tags:
- watcher-install
- watcher-config
- include: watcher_init.yml
- include_tasks: watcher_init.yml
tags:
- watcher-install
@ -85,7 +85,7 @@
tags:
- watcher-install
- include: watcher_service_setup.yml
- include_tasks: watcher_service_setup.yml
when: inventory_hostname == groups['watcher_api'][0]
tags:
- watcher-install

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: watcher_init_common.yml
- include_tasks: watcher_init_common.yml
vars:
program_name: "{{ watcher_api_program_name }}"
service_name: "{{ watcher_service_name }}"
@ -23,7 +23,7 @@
init_config_overrides: "{{ watcher_api_init_config_overrides }}"
when: inventory_hostname in groups['watcher_api']
- include: watcher_init_common.yml
- include_tasks: watcher_init_common.yml
vars:
program_name: "{{ watcher_decision_engine_program_name }}"
service_name: "{{ watcher_service_name }}"
@ -33,7 +33,7 @@
init_config_overrides: "{{ watcher_decision_init_config_overrides }}"
when: inventory_hostname in groups['watcher_decision_engine']
- include: watcher_init_common.yml
- include_tasks: watcher_init_common.yml
vars:
program_name: "{{ watcher_applier_program_name }}"
service_name: "{{ watcher_service_name }}"

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: watcher_init_upstart.yml
- include_tasks: watcher_init_upstart.yml
static: no
when: pid1_name == "init"
- include: watcher_init_systemd.yml
- include_tasks: watcher_init_systemd.yml
static: no
when: pid1_name == "systemd"

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: install-apt.yml
- include_tasks: install-apt.yml
static: no
when: ansible_pkg_mgr == 'apt'

View File

@ -14,13 +14,13 @@
# 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 Watcher
- include: test-install-watcher.yml
- import_playbook: test-install-watcher.yml