summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Chapman <woppin@gmail.com>2016-06-02 14:34:15 +1000
committerTim Rozet <trozet@redhat.com>2016-06-08 14:53:51 -0400
commit5df1ac0a14075d708c89d35705097a83340cd424 (patch)
treed6f115f41b15fb8e254017e794e4f815e1ad0ebd /ci
parent7c6742771c774cfcdfb88ec15a3bc0f4f88088dd (diff)
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 <woppin@gmail.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 6 insertions, 0 deletions
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