summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-25 21:06:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-25 21:06:36 +0000
commit6b5a9c96809acfbb516918db7ab3ba36eb7fda92 (patch)
treeac410182ddbabaee2db7dcaef0d66417a8787b92
parent217a97a33db42da90e7f62231b74efa3ef120131 (diff)
parent2370aea5cb854569722897dcb37341841842e873 (diff)
Merge "Fixes nic template missing in spec and error catching"
-rw-r--r--build/opnfv-apex-undercloud.spec7
-rwxr-xr-xci/build.sh11
-rwxr-xr-xci/deploy.sh15
3 files changed, 30 insertions, 3 deletions
diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec
index ae72485f..0e4798b3 100644
--- a/build/opnfv-apex-undercloud.spec
+++ b/build/opnfv-apex-undercloud.spec
@@ -27,6 +27,8 @@ install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/
install build/nics-controller.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-controller.yaml.template
install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-compute.yaml.template
+install build/nics-controller.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-controller.yaml.jinja2
+install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-compute.yaml.jinja2
%files
%defattr(644, root, root, -)
@@ -34,8 +36,13 @@ install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-comp
%{_var}/opt/opnfv/network-environment.yaml
%{_var}/opt/opnfv/nics-controller.yaml.template
%{_var}/opt/opnfv/nics-compute.yaml.template
+%{_var}/opt/opnfv/nics-controller.yaml.jinja2
+%{_var}/opt/opnfv/nics-compute.yaml.jinja2
+
%changelog
+* Thu May 24 2016 Tim Rozet <trozet@redhat.com> - 3.0-1
+- Adds jinja2 nic templates
* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
- Version update for Colorado
* Wed Mar 30 2016 Dan Radez <dradez@redhat.com> - 2.1-2
diff --git a/ci/build.sh b/ci/build.sh
index 7e080bed..e6870558 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -35,6 +35,7 @@ CACHE_DEST=""
CACHE_DIR="cache"
CACHE_NAME="apex-cache"
MAKE_TARGETS="images"
+REQUIRED_PKGS="rpm-build python-docutils"
parse_cmdline() {
while [ "${1:0:1}" = "-" ]
@@ -82,6 +83,16 @@ run_make() {
parse_cmdline "$@"
+# Install build dependencies
+for pkg in $REQUIRED_PKGS; do
+ if ! rpm -q $pkg > /dev/null; then
+ if ! sudo yum -y install $pkg > /dev/null; then
+ echo "Required package $pkg missing and installation failed."
+ exit 1
+ fi
+ fi
+done
+
if [ -n "$RELEASE" ]; then MAKE_ARGS+="RELEASE=$RELEASE "; fi
# Get the Old Cache
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 59cfc6d1..677d4484 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -618,7 +618,7 @@ function configure_network_environment {
##Copy over the glance images and instackenv json file
##params: none
function configure_undercloud {
-
+ local controller_nic_template compute_nic_template
echo
echo "Copying configuration files to Undercloud"
if [[ "$net_isolation_enabled" == "TRUE" ]]; then
@@ -626,13 +626,22 @@ function configure_undercloud {
echo -e "${blue}Network Environment set for Deployment: ${reset}"
cat $CONFIG/network-environment.yaml
scp ${SSH_OPTIONS[@]} $CONFIG/network-environment.yaml "stack@$UNDERCLOUD":
+ if ! controller_nic_template=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py nic_template -d $CONFIG -f nics-controller.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then
+ echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}"
+ exit 1
+ fi
+
+ if ! compute_nic_template=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py nic_template -d $CONFIG -f nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then
+ echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}"
+ exit 1
+ fi
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" << EOI
mkdir nics/
cat > nics/controller.yaml << EOF
-$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py nic_template -d $CONFIG -f nics-controller.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family)
+$controller_nic_template
EOF
cat > nics/compute.yaml << EOF
-$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py nic_template -d $CONFIG -f nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family)
+$compute_nic_template
EOF
EOI
fi