openstack
/
openstack-ansible-os_watcher
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: I144d570555780b46ed132e4895d9f640f2d95555
This commit is contained in:
caoyuan 2018-07-24 18:58:00 +08:00
parent 489aaff27e
commit ffd4d551ee
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/main.yml
View File

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

6
tasks/watcher_init.yml
View File

@ -13,7 +13,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: watcher_init_common.yml - include_tasks: watcher_init_common.yml
vars: vars:
program_name: "{{ watcher_api_program_name }}" program_name: "{{ watcher_api_program_name }}"
service_name: "{{ watcher_service_name }}" service_name: "{{ watcher_service_name }}"
@ -23,7 +23,7 @@
init_config_overrides: "{{ watcher_api_init_config_overrides }}" init_config_overrides: "{{ watcher_api_init_config_overrides }}"
when: inventory_hostname in groups['watcher_api'] when: inventory_hostname in groups['watcher_api']
- include: watcher_init_common.yml - include_tasks: watcher_init_common.yml
vars: vars:
program_name: "{{ watcher_decision_engine_program_name }}" program_name: "{{ watcher_decision_engine_program_name }}"
service_name: "{{ watcher_service_name }}" service_name: "{{ watcher_service_name }}"
@ -33,7 +33,7 @@
init_config_overrides: "{{ watcher_decision_init_config_overrides }}" init_config_overrides: "{{ watcher_decision_init_config_overrides }}"
when: inventory_hostname in groups['watcher_decision_engine'] when: inventory_hostname in groups['watcher_decision_engine']
- include: watcher_init_common.yml - include_tasks: watcher_init_common.yml
vars: vars:
program_name: "{{ watcher_applier_program_name }}" program_name: "{{ watcher_applier_program_name }}"
service_name: "{{ watcher_service_name }}" service_name: "{{ watcher_service_name }}"

4
tasks/watcher_init_common.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: watcher_init_upstart.yml - include_tasks: watcher_init_upstart.yml
static: no static: no
when: pid1_name == "init" when: pid1_name == "init"
- include: watcher_init_systemd.yml - include_tasks: watcher_init_systemd.yml
static: no static: no
when: pid1_name == "systemd" when: pid1_name == "systemd"

2
tasks/watcher_install.yml
View File

@ -13,7 +13,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: install-apt.yml - include_tasks: install-apt.yml
static: no static: no
when: ansible_pkg_mgr == 'apt' when: ansible_pkg_mgr == 'apt'

8
tests/test.yml
View File

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