Support multiple libvirt daemon names

With the latest roll of the hlinunx repo the name of the libvirt
daemon has changed to libvirtd. Support this new name as well as
the old libvirt-bin

Change-Id: I8b8a5bb987d93e3f62d11d6fa2e82e6e351d80b2

Troubleshooting.rst

@@ -482,10 +482,13 @@ stop.
 
         virsh list
 
-    * If `virsh list` fails, you may need to restart libvirt-bin. Do
+    * If `virsh list` fails, you may need to restart libvirt-bin or
+      libvirtd depending on which process you are running. Do
       so by running::
 
         service libvirt-bin restart
+        or
+        service libvirtd restart
 
   * Solution:
 

playbooks/stop_vms.yml

@@ -12,10 +12,13 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-- name: Ensure libvirt-bin is running
+- service_facts:
+  when: instance_status == "ACTIVE"
+- name: Ensure libvirt daemon is running
   sudo: yes
-  service: name=libvirt-bin state=started enabled=yes
-  when: use_nova_powercontrol is not defined
+  service: name={{ item }} state=started enabled=yes
+  when: use_nova_powercontrol is not defined and item in existing_services
+  with_items: hypervisor_daemons
 - name: Collect list of VMs
   sudo: yes
   virt: command=list_vms

plugins/inventory/group_vars/all

@@ -29,6 +29,9 @@ ssh_timeout: 900
 # Attempt online upgrade of compute nodes
 # online_upgrade: True
 default_update_file_location: /tmp/update_image.qcow2
+hypervisor_daemons:
+  - libvirt-bin
+  - libvirtd
 overcloud_controller_services:
   - haproxy
   - apache2
@@ -148,14 +151,14 @@ helion_overcloud_bootstrap_controller_services:
 overcloud_compute_services:
   - neutron-openvswitch-agent
   - neutron-metadata-agent
-  - libvirt-bin
+  - "{{ hypervisor_daemons }}"
   - snmpd
 helion_overcloud_compute_services:
   - beaver
   - neutron-openvswitch-agent
   - neutron-metadata-agent
   - neutron-l3-agent
-  - libvirt-bin
+  - "{{ hypervisor_daemons }}"
   - open-iscsi
 # This overcloud swift list is for upstream openstack
 overcloud_swift_services: