Rebuild HA Architecture with correct sub-sections.

Cherry picked from https://review.openstack.org/#/c/19690/

Change-Id: I66675da53cb2900ffb615dc6c21ff91300b2de0f