CORE-1610 Initial addition of VSA node support

This commit adds initial support for VSA nodes.

Change-Id: I1cd288b02b53f5e76e161bdd5981caa9abb677c9
This commit is contained in:
Julia Kreger 2014-09-19 09:01:10 -04:00 committed by Clint Byrum
parent a7e70172ae
commit 6d586fd683
4 changed files with 48 additions and 2 deletions

View File

@ -79,7 +79,7 @@ subsituted into place. Current variables for passing the image variables
in are nova_compute_rebuild_image_id and controller_rebuild_image_id
which are passed into the chained playbook.
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 controllermgmt_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc -e swift_storage_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 controllermgmt_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
Below, we break down the above command so you can see what each part does:
@ -89,7 +89,8 @@ 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 controllermgmt_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc - Sets the storage node image ID.
* -e swift_storage_rebuild_image_id=2432dd37-a072-463d-ab86-0861bb5f36cc - Sets the storage 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:

View File

@ -57,6 +57,17 @@
- 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"
sudo: yes
gather_facts: no
max_fail_percentage: 0
tasks:
- 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
sudo: yes
@ -335,6 +346,35 @@
- service: name={{ item }} enabled=yes state=started
with_items: overcloud_swift_services
when: helion is not defined and item in existing_services
- 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: 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: disable_os_collect_config.yml
- name: "Run os-collect-config"
sudo: yes
command: os-collect-config --force --one
- 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
- hosts: nova-compute
name: Rebuild and Refresh Nova Compute
gather_facts: no

View File

@ -229,3 +229,5 @@ helion_undercloud_services:
- logstash
- neutron-openvswitch-agent
- rabbitmq-server
helion_overcloud_vsa_services:
- vsa

View File

@ -34,6 +34,9 @@ for server in $(nova list | sed -e 's/ //g' | awk -F\| '/ACTIVE/ { print $2 "++"
*SwiftStorage*)
group="swift-storage"
;;
*Vsa*)
group="vsa"
;;
*controllerMgmt*)
group="controllerMgmt"
;;