From: Tim Rozet Date: Sat, 18 Feb 2017 12:52:54 +0000 (+0000) Subject: Merge "Adding Quagga to build" X-Git-Tag: danube.1.0~56 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=645949cbac2bb766d18dfd9f818b6c14545a35e2;hp=a7155293dba7c21f060b671b15fc36a66b84de83;p=apex.git Merge "Adding Quagga to build" --- diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index db271848..be181c0a 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -22,8 +22,8 @@ https://wiki.opnfv.org/apex %setup -q %build -rst2html docs/installationprocedure/index.rst docs/installation-instructions.html -rst2html docs/releasenotes/release-notes.rst docs/release-notes.html +rst2html docs/release/installation/index.rst docs/release/installation/installation-instructions.html +rst2html docs/release/release-notes/release-notes.rst docs/release/release-notes/release-notes.html %global __python %{__python3} @@ -86,9 +86,9 @@ install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/ mkdir -p %{buildroot}%{_docdir}/opnfv/ install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ -install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ -install docs/releasenotes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst -install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ +install docs/release/installation/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ +install docs/release/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst +install docs/release/release-notes/release-notes.html %{buildroot}%{_docdir}/opnfv/ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example install config/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example install config/network/network_settings_v6.yaml %{buildroot}%{_docdir}/opnfv/network_settings_v6.yaml.example diff --git a/build/variables.sh b/build/variables.sh index 4793ff86..c30aa2a7 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -17,7 +17,7 @@ PATCHES_DIR="${BUILD_ROOT}/patches" rdo_images_uri=http://buildlogs.centos.org/centos/7/cloud/x86_64/tripleo_images/newton/delorean onos_release_uri=https://downloads.onosproject.org/nightly/ -onos_release_file=onos-1.6.0-rc2.tar.gz +onos_release_file=onos-1.8.0-rc6.tar.gz onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_pkg=package_ovs_rpm3.tar.gz diff --git a/docs/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst similarity index 100% rename from docs/configguide/installerconfig.rst rename to docs/release/configguide/installerconfig.rst diff --git a/docs/installationprocedure/abstract.rst b/docs/release/installation/abstract.rst similarity index 100% rename from docs/installationprocedure/abstract.rst rename to docs/release/installation/abstract.rst diff --git a/docs/installationprocedure/architecture.rst b/docs/release/installation/architecture.rst similarity index 100% rename from docs/installationprocedure/architecture.rst rename to docs/release/installation/architecture.rst diff --git a/docs/installationprocedure/baremetal.rst b/docs/release/installation/baremetal.rst similarity index 100% rename from docs/installationprocedure/baremetal.rst rename to docs/release/installation/baremetal.rst diff --git a/docs/installationprocedure/index.rst b/docs/release/installation/index.rst similarity index 100% rename from docs/installationprocedure/index.rst rename to docs/release/installation/index.rst diff --git a/docs/installationprocedure/introduction.rst b/docs/release/installation/introduction.rst similarity index 100% rename from docs/installationprocedure/introduction.rst rename to docs/release/installation/introduction.rst diff --git a/docs/installationprocedure/references.rst b/docs/release/installation/references.rst similarity index 100% rename from docs/installationprocedure/references.rst rename to docs/release/installation/references.rst diff --git a/docs/installationprocedure/requirements.rst b/docs/release/installation/requirements.rst similarity index 100% rename from docs/installationprocedure/requirements.rst rename to docs/release/installation/requirements.rst diff --git a/docs/installationprocedure/troubleshooting.rst b/docs/release/installation/troubleshooting.rst similarity index 100% rename from docs/installationprocedure/troubleshooting.rst rename to docs/release/installation/troubleshooting.rst diff --git a/docs/installationprocedure/verification.rst b/docs/release/installation/verification.rst similarity index 100% rename from docs/installationprocedure/verification.rst rename to docs/release/installation/verification.rst diff --git a/docs/installationprocedure/virtualinstall.rst b/docs/release/installation/virtualinstall.rst similarity index 100% rename from docs/installationprocedure/virtualinstall.rst rename to docs/release/installation/virtualinstall.rst diff --git a/docs/releasenotes/index.rst b/docs/release/release-notes/index.rst similarity index 100% rename from docs/releasenotes/index.rst rename to docs/release/release-notes/index.rst diff --git a/docs/releasenotes/release-notes.rst b/docs/release/release-notes/release-notes.rst similarity index 100% rename from docs/releasenotes/release-notes.rst rename to docs/release/release-notes/release-notes.rst