Merge "Do not configure smt disabling init scripts always"

This commit is contained in:
Jenkins 2016-11-14 19:32:52 +00:00 committed by Gerrit Code Review
commit ca79eed523

View File

@ -15,6 +15,7 @@
- name: Disable SMT - name: Disable SMT
command: /usr/sbin/ppc64_cpu --smt=off command: /usr/sbin/ppc64_cpu --smt=off
register: smt_disable_result
changed_when: false changed_when: false
failed_when: false failed_when: false
tags: tags:
@ -29,6 +30,8 @@
group: "root" group: "root"
when: when:
- ansible_service_mgr == 'systemd' - ansible_service_mgr == 'systemd'
- smt_disable_result.rc is defined
- smt_disable_result.rc == 0
notify: notify:
- Reload systemd daemon - Reload systemd daemon
@ -38,5 +41,7 @@
dest: "/etc/init/smt.conf" dest: "/etc/init/smt.conf"
when: when:
- ansible_service_mgr != 'systemd' - ansible_service_mgr != 'systemd'
- smt_disable_result.rc is defined
- smt_disable_result.rc == 0
notify: notify:
- Reload upstart init scripts - Reload upstart init scripts