Merge "Add custom domain file for virtual deploy"

diff --cc build/opnfv-apex-common.spec
index af0f933,834c0b0..fc82fca
--- 1/build/opnfv-apex-common.spec
--- 2/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@@ -81,11 -80,10 +82,12 @@@ install config/inventory/pod_example_se
  %{_var}/opt/opnfv/lib/python/
  %{python3_sitelib}/apex/
  %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
+ %{_var}/opt/opnfv/lib/installer/domain.xml
  %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
 +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml
  %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
  %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
 +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
  %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
  %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
  %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml

diff --cc ci/deploy.sh
Simple merge