From 7824df26b64c392fcdb6fe517c40356cc89c9305 Mon Sep 17 00:00:00 2001 From: Frank Brockners Date: Tue, 23 Feb 2016 03:24:43 -0800 Subject: Moved all docs to appropriate folder artifacts-location.rst was still left in the docs/sources directory. This patch moves it to the requirements document so that the docs pipeline can pick it up. The index.rst in the requirements directory is updated accordingly. Change-Id: I736391acd0ccfdfaf3d8a3aa43424d1c85ef0e9a Signed-off-by: Frank Brockners (cherry picked from commit 85edacd2a9df555b90f59d09ea75d99da0ee7c6f) --- docs/requirements/README.md | 8 +++ docs/requirements/artifacts-location.rst | 108 +++++++++++++++++++++++++++++++ docs/requirements/index.rst | 2 +- docs/sources/README.md | 17 ----- docs/sources/artifacts-location.rst | 100 ---------------------------- 5 files changed, 117 insertions(+), 118 deletions(-) create mode 100644 docs/requirements/README.md create mode 100644 docs/requirements/artifacts-location.rst delete mode 100644 docs/sources/README.md delete mode 100644 docs/sources/artifacts-location.rst diff --git a/docs/requirements/README.md b/docs/requirements/README.md new file mode 100644 index 0000000..570a90c --- /dev/null +++ b/docs/requirements/README.md @@ -0,0 +1,8 @@ +.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors + +.. This work is licensed under the +.. Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +# Requirements documents +This directory contains the sources for documents which list requirements which are common across all deployment tools and as such are also met by all deployment tools (a.k.a. "installers"). diff --git a/docs/requirements/artifacts-location.rst b/docs/requirements/artifacts-location.rst new file mode 100644 index 0000000..d77dd62 --- /dev/null +++ b/docs/requirements/artifacts-location.rst @@ -0,0 +1,108 @@ +.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors + +.. This work is licensed under the +.. Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +.. ----------------------------------------------------------------------- + + +================================= +Key artifacts and their locations +================================= + +Release: OPNFV Brahmaputra + + +VM manager components +===================== + +* OpenStack:: + + location: ``_ + joid_location: cloud-archive:liberty + release: Liberty + +Network controller components +============================= + +* OpenDaylight Controller:: + + location: `https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz' + release: Beryllium RC2 + +* OpenDaylight SFC:: + + location: ``_ + +* ONOS Controller:: + + location: ``_ + release: Emu 1.4.0-rc2 + +vSwitch components +================== + + * OVS NSH build:: + + location: ``_ + commit: 121daded51b9798fe3722824b27a05c16806cbd1 + + * OVS build:: + + joid_location: `cloud-archive:liberty` + release: 1.4.0 + +JOID components +=============== + + * MAAS:: + + location: ppa:maas/stable + release: 1.9.0 + + * JUJU:: + + location: ppa:juju/stable + release: 1.25.3 + + * CHARM:: + + location: https://code.launchpad.net/~openstack-charmers + charm: "cs:trusty/juju-gui" + charm: "cs:trusty/ubuntu" + charm: "cs:trusty/mongodb" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + branch: lp:~openstack-charmers/charms/trusty/ceph/next + branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next + branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next + branch: lp:~openstack-charmers/charms/trusty/cinder/next + branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next + branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next + branch: lp:~openstack-charmers/charms/trusty/keystone/next + branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next + branch: lp:~openstack-charmers/charms/trusty/odl-controller/next + branch: lp:~openstack-charmers/charms/trusty/glance/next + branch: lp:~narindergupta/charms/trusty/promise/trunk + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next + branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk + branch: lp:~charmers/charms/precise/zookeeper/trunk + branch: lp:~stub/charms/trusty/cassandra/noauthentication + branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk + branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk + branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk + branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk + branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk + branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk + branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk + branch: "lp:~wuwenbin2/onosfw/onos-controller" + branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" + branch: "lp:~wuwenbin2/onosfw/openvswitch-onos" diff --git a/docs/requirements/index.rst b/docs/requirements/index.rst index 12f1c2a..9d7e29f 100644 --- a/docs/requirements/index.rst +++ b/docs/requirements/index.rst @@ -11,4 +11,4 @@ OPNFV deployment tools common requirements ./userexperience.rst ./system.rst ./component-support.rst - + ./artifacts-location.rst diff --git a/docs/sources/README.md b/docs/sources/README.md deleted file mode 100644 index f88c3ce..0000000 --- a/docs/sources/README.md +++ /dev/null @@ -1,17 +0,0 @@ - -# Requirements documents -This directory contains the sources for documents which list requirements which are common across all deployment tools and as such are also met by all deployment tools (a.k.a. "installers"). diff --git a/docs/sources/artifacts-location.rst b/docs/sources/artifacts-location.rst deleted file mode 100644 index 468b9dd..0000000 --- a/docs/sources/artifacts-location.rst +++ /dev/null @@ -1,100 +0,0 @@ -.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors - -.. This work is licensed under the -.. Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -.. ----------------------------------------------------------------------- - - -================================= -Key artifacts and their locations -================================= - -Release: OPNFV Brahmaputra - - -VM manager components -===================== - -* OpenStack:: - location: ``_ - joid_location: cloud-archive:liberty - release: Liberty - -Network controller components -============================= - -* OpenDaylight Controller:: - location: `https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz' - release: Beryllium RC2 - -* OpenDaylight SFC:: - location: ``_ - -* ONOS Controller:: - location: ``_ - release: Emu 1.4.0-rc2 - -vSwitch components -================== - - * OVS NSH build:: - location: ``_ - commit: 121daded51b9798fe3722824b27a05c16806cbd1 - - * OVS build:: - joid_location: `cloud-archive:liberty` - release: 1.4.0 - -JOID components -=============== - - * MAAS:: - location: ppa:maas/stable - release: 1.9.0 - - * JUJU:: - location: ppa:juju/stable - release: 1.25.3 - - * CHARM:: - location: https://code.launchpad.net/~openstack-charmers - charm: "cs:trusty/juju-gui" - charm: "cs:trusty/ubuntu" - charm: "cs:trusty/mongodb" - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" - branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" - branch: "lp:~openstack-charmers/charms/trusty/heat/next" - branch: lp:~openstack-charmers/charms/trusty/ceph/next - branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next - branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next - branch: lp:~openstack-charmers/charms/trusty/cinder/next - branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next - branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next - branch: lp:~openstack-charmers/charms/trusty/keystone/next - branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next - branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next - branch: lp:~openstack-charmers/charms/trusty/odl-controller/next - branch: lp:~openstack-charmers/charms/trusty/glance/next - branch: lp:~narindergupta/charms/trusty/promise/trunk - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next - branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk - branch: lp:~charmers/charms/precise/zookeeper/trunk - branch: lp:~stub/charms/trusty/cassandra/noauthentication - branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk - branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk - branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk - branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk - branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk - branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk - branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk - branch: "lp:~wuwenbin2/onosfw/onos-controller" - branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" - branch: "lp:~wuwenbin2/onosfw/openvswitch-onos" - -- cgit 1.2.3-korg