Remove references to VSA nodes

Removing references to VSA node types as they are helion specific
node types that do not exist downstream.

Change-Id: I93a2b9b7c259c60dfa7c82ded7fe5895cac19a75

README.rst

@@ -142,7 +142,7 @@ Once you are ready to execute the update, below is an example command
 for updating the overcloud, showing all of the disk image IDs being
 defined on the command line.
 
-    ansible-playbook -vvvv -u heat-admin -i plugins/inventory/heat.py -e nova_compute_rebuild_image_id=1ae9fe6e-c0cc-4f62-8e2b-1d382b20fdcb -e controller_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc -e swift_storage_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc -e vsa_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc playbooks/update_cloud.yml
+    ansible-playbook -vvvv -u heat-admin -i plugins/inventory/heat.py -e nova_compute_rebuild_image_id=1ae9fe6e-c0cc-4f62-8e2b-1d382b20fdcb -e controller_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc -e swift_storage_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc playbooks/update_cloud.yml
 
 If you have set the image ids in group vars or via the
 populate_image_vars script:
@@ -157,7 +157,6 @@ Below, we break down the above command so you can see what each part does:
  * -e nova_compute_rebuild_image_id=1ae9fe6e-c0cc-4f62-8e2b-1d382b20fdcb - Sets the compute node image ID.
  * -e controller_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc - Sets the controller node image ID.
  * -e swift_storage_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc - Sets the swift storage node image ID.
- * -e vsa_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc - Sets the vsa node image ID.
  * playbooks/update_cloud.yml is the path and file name to the ansible playbook that will be utilized.
 
 Upon a successful completion, ansible will print a summary report:

playbooks/step_check_image_vars.yml

@@ -28,11 +28,6 @@
   tasks:
     - fail: msg="swift_storage_rebuild_image_id is not defined"
       when: swift_storage_rebuild_image_id is not defined or swift_storage_rebuild_image_id == "" or swift_storage_rebuild_image_id == None
-- hosts: vsa
-  name: Check we have VSA image ID for rebuild
-  tasks:
-    - fail: msg="vsa_rebuild_image_id is not defined"
-      when: vsa_rebuild_image_id is not defined or vsa_rebuild_image_id == "" or vsa_rebuild_image_id == None
 - hosts: nova-compute
   name: Check we have nova compute image ID for rebuild
   tasks:

playbooks/update_cloud.yml

@@ -83,23 +83,6 @@
     - service: name={{ item }} enabled=no state=stopped
       with_items: overcloud_swift_services
       when: helion is not defined and instance_status == "ACTIVE" and item in existing_services
-- hosts: vsa
-  name: "Stop services on VSA"
-  tags: shutdown-cloud
-  sudo: yes
-  gather_facts: no
-  max_fail_percentage: 0
-  tasks:
-    - include: disable_os_collect_config.yml
-    - fail: "Fail if online_upgrade is defined - online upgrades are not supported on vsa instances."
-      when: online_upgrade is defined
-    - include: stop_vms.yml
-      when: instance_status == "ACTIVE"
-    - service_facts:
-      when: instance_status == "ACTIVE"
-    - service: name={{ item }} enabled=no state=stopped
-      with_items: helion_overcloud_vsa_services
-      when: helion is defined and instance_status == "ACTIVE" and item in existing_services
 - hosts: controller
   name: Disable Overcloud Controller
   tags: shutdown-cloud
@@ -477,35 +460,6 @@
       sudo: yes
       when: helion is not defined and item in existing_services
     - include: enable_start_os_collect_config.yml
-- hosts: vsa
-  name: Rebuild and Refresh vsa
-  gather_facts: no
-  max_fail_percentage: 0
-  tasks:
-    - include: preserve_ssh_host_keys.yml
-      when: instance_status == "ACTIVE"
-    - include: step_unmount.yml
-      when: instance_status == "ACTIVE"
-    - { include: rebuild.yml, instance_id: "{{ instance_id }}", rebuild_image_id: "{{ vsa_rebuild_image_id }}", when: instance_status != "REBUILD" }
-    - local_action: wait_for port=22 timeout="{{ ssh_timeout }}" host="{{ inventory_hostname }}" search_regex=TRIPLEO_HK_RESTORED delay=10
-      when: wait_for_hostkey is defined
-      ignore_errors: yes
-    - local_action: wait_for port=22 timeout="{{ ssh_timeout }}" host="{{ inventory_hostname }}" search_regex=OpenSSH delay=10
-      when: wait_for_hostkey is not defined
-      ignore_errors: yes
-    - include: refresh_config.yml
-- hosts: vsa
-  name: Enable VSA
-  sudo: yes
-  max_fail_percentage: 0
-  tasks:
-    - include: step_run_occ.yml
-    - service_facts:
-      when: instance_status == "ACTIVE"
-    - service: name={{ item }} enabled=yes state=started
-      with_items: helion_overcloud_vsa_services
-      when: helion is defined and item in existing_services
-    - include: enable_start_os_collect_config.yml
 - hosts: nova-compute
   name: "Download image from glance if online upgrade is being invoked"
   gather_facts: no

plugins/inventory/group_vars/all

@@ -261,5 +261,3 @@ helion_undercloud_services:
   - neutron-openvswitch-agent
   - rabbitmq-server
   - mysql
-helion_overcloud_vsa_services:
-  - vsa

scripts/inject_nova_meta.bash

@@ -46,9 +46,6 @@ while read -r instance; do
     *SwiftStorage*)
         group="swift-storage"
         ;;
-    *Vsa*)
-        group="vsa"
-        ;;
     *controller*)
         group="controller"
         get_bootstrap_node $IP