Merge "Image fix to force flavor to be 39GB"

diff --git a/build/Makefile b/build/Makefile
index 7fd3228..87e8db0 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -110,11 +110,7 @@ rpm:
        tar -u --xform="s:brbm1-net.xml:opnfv-apex-$(RPMVERS)/build/brbm1-net.xml:" --file=opnfv-apex.tar brbm1-net.xml
        tar -u --xform="s:default-pool.xml:opnfv-apex-$(RPMVERS)/build/default-pool.xml:" --file=opnfv-apex.tar default-pool.xml
        tar -u --xform="s:instackenv-virt.json:opnfv-apex-$(RPMVERS)/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json
-       tar -u --xform="s:instackenv.json.example:opnfv-apex-$(RPMVERS)/build/instackenv.json.example:" --file=opnfv-apex.tar instackenv.json.example
        tar -u --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" --file=opnfv-apex.tar stack/overcloud-full-odl.qcow2
-       tar -u --xform="s:network-environment.yaml:opnfv-apex-$(RPMVERS)/build/network-environment.yaml:" --file=opnfv-apex.tar network-environment.yaml
-       tar -u --xform="s:opendaylight-puppet-neutron.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-puppet-neutron.patch:" --file=opnfv-apex.tar opendaylight-puppet-neutron.patch
-       tar -u --xform="s:opendaylight-tripleo-heat-templates.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-tripleo-heat-templates.patch:" --file=opnfv-apex.tar opendaylight-tripleo-heat-templates.patch
        gzip -f opnfv-apex.tar
        rpmbuild -ba opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')"
 

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index ee81948..9b6a6f8 100644 (file)
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -43,8 +43,6 @@ install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/
 install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/
 install build/nics/controller.yaml %{buildroot}%{_var}/opt/opnfv/nics/
 install build/nics/compute.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/opendaylight-puppet-neutron.patch %{buildroot}%{_var}/opt/opnfv/
-install build/opendaylight-tripleo-heat-templates.patch %{buildroot}%{_var}/opt/opnfv/
 
 install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/
 install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/
@@ -70,8 +68,6 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s
 %{_var}/opt/opnfv/network-environment.yaml
 %{_var}/opt/opnfv/nics/controller.yaml
 %{_var}/opt/opnfv/nics/compute.yaml
-%{_var}/opt/opnfv/opendaylight-puppet-neutron.patch
-%{_var}/opt/opnfv/opendaylight-tripleo-heat-templates.patch
 %{_var}/opt/opnfv/instackenv-virt.json
 %{_var}/opt/opnfv/instackenv.json.example
 %{_var}/opt/opnfv/stack/overcloud-full.qcow2
@@ -86,6 +82,7 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s
 %changelog
 * Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.6-1
 - Added deploy settings for flat network config
+- cleaned up files that don't need to be in the rpm
 * 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

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 1abc3c4..8b5fa53 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -482,7 +482,7 @@ if [ -n "$DEPLOY_SETTINGS_FILE" ]; then
   openstack-config --set undercloud.conf DEFAULT inspection_iprange ${deploy_options_array['provisioning_inspection_iprange']}
   openstack-config --set undercloud.conf DEFAULT undercloud_debug false
 
-  if [ -n "$net_isolation_enabled" ]; then 
+  if [ -n "$net_isolation_enabled" ]; then
     sed -i '/ControlPlaneSubnetCidr/c\\  ControlPlaneSubnetCidr: "${deploy_options_array['provisioning_cidr']##*/}"' network-environment.yaml
     sed -i '/ControlPlaneDefaultRoute/c\\  ControlPlaneDefaultRoute: ${deploy_options_array['provisioning_gateway']}' network-environment.yaml
     sed -i '/ExternalNetCidr/c\\  ExternalNetCidr: ${deploy_options_array['ext_net_cidr']}' network-environment.yaml

diff --git a/docs/installation-instructions/installation-instructions.rst b/docs/installation-instructions/installation-instructions.rst
index 8703fdd..46fcfaa 100644 (file)
--- a/docs/installation-instructions/installation-instructions.rst
+++ b/docs/installation-instructions/installation-instructions.rst
@@ -252,18 +252,29 @@ system to bare metal nodes.
 Install Bare Metal Jumphost
 ---------------------------
 
-1.  If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh
-    install, then download the Apex bootable ISO <http://artifacts.opnfv.org/> here.
+1a. If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh
+    install, then download the Apex bootable ISO from OPNFV artifacts <http://artifacts.opnfv.org/>.
 
-2.  Boot the ISO off of a USB or other installation media and walk through installing OPNFV CentOS 7.
-    The ISO comes prepare to be written directly to a USB drive with dd as such:
+1b. If your Jump host already has CentOS 7 with libvirt running on it then install the
+    opnfv-apex RPM from OPNFV artifacts <http://artifacts.opnfv.org/>.
+
+2a.  Boot the ISO off of a USB or other installation media and walk through installing OPNFV CentOS 7.
+    The ISO comes prepared to be written directly to a USB drive with dd as such:
 
     ``dd if=opnfv-apex.iso of=/dev/sdX bs=4M``
 
     Replace /dev/sdX with the device assigned to your usb drive. Then select the USB device as the
     boot media on your Jumphost
 
-3.  After OS is installed login to your Jumphost as root.
+2b. Install the RDO Release RPM and the opnfv-apex RPM:
+
+    ``sudo yum install -y https://www.rdoproject.org/repos/rdo-release.rpm opnfv-apex-{version}.rpm``
+
+    The RDO Project release repository is needed to install OpenVSwitch, which is a dependency of
+    opnfv-apex. If you do not have external connectivity to use this repository you need to download
+    the OpenVSwitch RPM from the RDO Project repositories and install it with the opnfv-apex RPM.
+
+3.  After the operating system and the opnfv-apex RPM are installed, login to your Jumphost as root.
 
 4.  Configure IP addresses on the interfaces that you have selected as your networks.