From 5df1ac0a14075d708c89d35705097a83340cd424 Mon Sep 17 00:00:00 2001 From: Michael Chapman Date: Thu, 2 Jun 2016 14:34:15 +1000 Subject: Add custom domain file for virtual deploy Upstream packaging for tripleo-incubator seems to be lagging significantly, and in addition we will likely want to add a myriad of custom features like numa support that may not be suitable for upstream, so copy our own domain.xml into the tripleo templates directory when deploying. This may be improved in future if we can land a patch that allows a custom template directory to be specified upstream, and have it packaged and released. Change-Id: I7e7e7f695d9473545014761e9f8986616bc2cd19 JIRA: APEX-119 JIRA: APEX-106 JIRA: APEX-127 Signed-off-by: Michael Chapman Signed-off-by: Tim Rozet --- build/opnfv-apex-common.spec | 4 ++++ ci/deploy.sh | 6 ++++++ lib/installer/domain.xml | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 lib/installer/domain.xml diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 327df3bc..834c0b08 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -59,6 +59,7 @@ install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ +install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/ mkdir -p %{buildroot}%{_docdir}/opnfv/ install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ @@ -79,6 +80,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_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-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml @@ -97,6 +99,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Thu Jun 2 2016 Michael Chapman - 3.0-7 +- Add custom libvirt domain.xml. * Wed Jun 1 2016 Feng Pan - 3.0-6 - Add performance deployment file * Sun May 15 2016 Feng Pan - 3.0-5 diff --git a/ci/deploy.sh b/ci/deploy.sh index 30a6af29..2cd2b45c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -567,6 +567,12 @@ EOF "ssh-user": "root" } EOF + #Overwrite the tripleo-inclubator domain.xml with our own, keeping a backup. + if [ ! -f /usr/share/tripleo/templates/domain.xml.bak ]; then + /usr/bin/mv -f /usr/share/tripleo/templates/domain.xml /usr/share/tripleo/templates/domain.xml.bak + fi + + /usr/bin/cp -f $LIB/installer/domain.xml /usr/share/tripleo/templates/domain.xml } ##Create virtual nodes in virsh diff --git a/lib/installer/domain.xml b/lib/installer/domain.xml new file mode 100644 index 00000000..c710e561 --- /dev/null +++ b/lib/installer/domain.xml @@ -0,0 +1,36 @@ + + %(name)s + %(memory)s + %(cpus)s + + + hvm + + + + + + + + + + destroy + restart + restart + + + + + + + + %(network)s + %(bm_network)s + %(enable_serial_console)s + + + + + -- cgit 1.2.3-korg