summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-12-15 15:44:01 -0500
committerDan Radez <dradez@redhat.com>2015-12-18 13:29:07 -0500
commitf79e4a1703ba54008e7049b041600546e0482f75 (patch)
treef51fc992680709817d18589bc5b51ae5a9bb002b /build
parent3011039e5e6308a88c28aa912de22f05355e5678 (diff)
Adding network configuration options
- enabling subnet configuration for undercloud - enabling external network configuration Change-Id: Id1951d31faa1a68f850a75e2466d30b8abcea8ac
Diffstat (limited to 'build')
-rwxr-xr-xbuild/instack.sh1
-rw-r--r--build/opnfv-apex.spec13
2 files changed, 9 insertions, 5 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 69fec70..48aef0b 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -113,7 +113,6 @@ else
echo -e "${blue}\rInstack VM has IP $UNDERCLOUD${reset}"
fi
-
# ensure that we can ssh to the undercloud
CNT=10
while ! ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "echo ''" > /dev/null && [ $CNT -gt 0 ]; do
diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index 88ec642..ee81948 100644
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -1,7 +1,7 @@
Name: opnfv-apex
-Version: 2.5
+Version: 2.6
Release: %{release}
-Summary: RDO Manager disk images for deployment
+Summary: Scripts and Disk images for deployment
Group: System Environment
License: Apache 2.0
@@ -13,9 +13,10 @@ BuildRequires: openvswitch qemu-kvm python-docutils
Requires: openvswitch qemu-kvm bridge-utils libguestfs-tools
%description
-These files are disk images used to launch the instack
+These files are scripts and disk images used to launch the instack
libvirt VM and to load into the instack undercloud machine
-to deploy an OpenStack overcloud.
+to deploy an OpenStack overcloud. Installation is done via RDO Manager
+https://rdoproject.org
%prep
%setup -q
@@ -55,6 +56,7 @@ install docs/installation-instructions/index.rst %{buildroot}%{_docdir}/opnfv/in
install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/
install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst
install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/
+install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example
%files
%{_bindir}/opnfv-deploy
@@ -78,9 +80,12 @@ install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/installation-instructions.html
%doc %{_docdir}/opnfv/release-notes.rst
%doc %{_docdir}/opnfv/release-notes.html
+%doc %{_docdir}/opnfv/deploy_settings.yaml.example
%changelog
+* Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.6-1
+- Added deploy settings for flat network config
* Wed Dec 09 2015 Dan Radez <dradez@redhat.com> - 2.5-1
- Updating the OpenDaylight Patch
* Fri Dec 05 2015 Dan Radez <dradez@redhat.com> - 2.4-1