From 9e14399ac6f2d03f89be04dfac5d8999b994c616 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 18 Oct 2017 10:20:59 -0500 Subject: fixes for Ephertes release documents. Change-Id: I105bcb653495b0cfe377d5f8bc07a55ebe0c2e16 Signed-off-by: Narinder Gupta (cherry picked from commit 363444982f6ff194b60fe9e57d09c8dfe0742f35) --- docs/release/configguide/configguide.rst | 30 +++++++++++------------ docs/release/configguide/installerconfig.rst | 36 ++++++++++++++++++---------- 2 files changed, 38 insertions(+), 28 deletions(-) (limited to 'docs/release/configguide') diff --git a/docs/release/configguide/configguide.rst b/docs/release/configguide/configguide.rst index ae1c793c..b9c27f34 100644 --- a/docs/release/configguide/configguide.rst +++ b/docs/release/configguide/configguide.rst @@ -1,27 +1,27 @@ JOID Configuration ================== -Scenario 1: ODL L2 ------------------- +Scenario 1: Nosdn +----------------- -*./deploy.sh -o newton -s odl -t ha -l custom -f none -d xenial -m openstack* +*./deploy.sh -o ocata -s nosdn -t ha -l custom -f none -d xenial -m openstack* -Scenario 2: Nosdn ------------------ +Scenario 2: Kubernetes core +--------------------------- -*./deploy.sh -o newton -s nosdn -t ha -l custom -f none -d xenial -m openstack* +*./deploy.sh -l custom -f none -m kubernetes* -Scenario 3: ONOS nofeature --------------------------- +Scenario 3: Kubernetes Load Balancer +------------------------------------ -*./deploy.sh -o newton -s onos -t ha -l custom -f none -d xenial -m openstack* +*./deploy.sh -l custom -f lb -m kubernetes* -Scenario 4: ONOS with SFC ------------------- +Scenario 4: Kubernetes with OVN +------------------------------- -*./deploy.sh -o newton -s onos -t ha -l custom -f none -d xenial -m openstack* +*./deploy.sh -s ovn -l custom -f lb -m kubernetes* -Scenario 5: Kubernetes core ---------------------------- +Scenario 5: Openstack with Opencontrail +--------------------------------------- -*./deploy.sh -l custom -f none -m kubernetes* +*./deploy.sh -o ocata -s ocl -t ha -l custom -f none -d xenial -m openstack* diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst index 94ee56fe..aee4ce25 100644 --- a/docs/release/configguide/installerconfig.rst +++ b/docs/release/configguide/installerconfig.rst @@ -252,29 +252,28 @@ OPNFV Install NOTE: Possible options are as follows: choose which sdn controller to use. - [-s ] + [-s|--sdn ] nosdn: openvswitch only and no other SDN. odl: OpenDayLight Boron version. opencontrail: OpenContrail SDN. - onos: ONOS framework as SDN. Mode of Openstack deployed. - [-t ] + [-t|--type ] noha: NO HA mode of Openstack ha: HA mode of openstack. Wihch version of Openstack deployed. - [-o ] + [-o|--openstack ] + Ocata: Ocata version of openstack. Newton: Newton version of openstack. - Mitaka: Mitaka version of openstack. Where to deploy - [-l ] etc... + [-l|--lab ] etc... custom: For bare metal deployment where labconfig.yaml provided externally and not part of JOID. default: For virtual deployment where installation will be done on KVM created using 03-maasdeploy.sh what feature to deploy. Comma seperated list - [-f ] + [-f|--feature ] none: no special feature will be enabled. ipv6: ipv6 will be enabled for tenant in openstack. lxd: With this feature hypervisor will be LXD rather than KVM. @@ -283,14 +282,24 @@ what feature to deploy. Comma seperated list sfc: Will enable sfc feature only supported with onos deployment. which Ubuntu distro to use. - [ -d ] + [ -d|--distro ] Which model to deploy JOID introduces the various model to deploy apart from openstack for docker based container workloads. -[-m ] +[-m|--model ] openstack: Openstack which will be used for KVM/LXD container based workloads. kubernetes: Kubernes model will be used for docker based workloads. +Deploy MAAS or not? +[--maasinstall <0|1>] + 0: Do not deploy MAAS + 1: Deploy MAAS first. + +Lab Config file location +[--labfile ] + location of the file labconfig.yaml if no valid location then virtual MAAS would be deployed. + + OPNFV Scenarios in JOID Following OPNFV scenarios can be deployed using JOID. Seperate yaml bundle will be created to deploy the individual scenario. @@ -300,10 +309,11 @@ os-nosdn-nofeature-noha Joid os-odl_l2-nofeature-ha Joid Floating ips are not working on this deployment. os-nosdn-lxd-ha Joid Yardstick team is working to support. os-nosdn-lxd-noha Joid Yardstick team is working to support. -os-onos-nofeature-ha ONOSFW -os-onos-sfc-ha ONOSFW -k8-nosdn-nofeature-noha Joid No support from Functest and Yardstick -k8-nosdn-lb-noha Joid No support from Functest and Yardstick +os-ocl-nofeature-ha OCL Keystone V2 has been used. +os-ocl-nofeature-noha OCL Keystone V2 has been used. +k8-nosdn-nofeature-noha Joid No support from Functest. +k8-nosdn-lb-noha Joid No support from Functest. +k8-ovn-lb-noha OVN No support from Functest. Is the deployment done successfully? ------------------------------------ -- cgit 1.2.3-korg