I've now changed the domain suffix so aruba-master is no longer resolvable so the AP's won't reach the California controller but they still aren't showing up on the in-region master. I've set up the following in DHCP
Option 43 = <IP of the controller VLAN interface>
Option 60 = ArubaAP
Is there anything else needed beyond the normal network, mask, and gateway?