diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2018-04-25 10:16:48 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2018-04-25 15:15:25 -0500 |
| commit | e00115a7a5ea27030cc4f36efdc298b6145cdb02 (patch) | |
| tree | 3b765aa925abd92b0b5e096141ea4525daa5a8c6 /docs/release/configguide | |
| parent | 6345ba5917f720c00b165530916436578bd4c327 (diff) | |
document update for Fraser release.
Change-Id: Iab88d244a8a39b78c84aa11550cee2c04f81ab0f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'docs/release/configguide')
| -rw-r--r-- | docs/release/configguide/configguide.rst | 12 | ||||
| -rw-r--r-- | docs/release/configguide/installerconfig.rst | 10 | ||||
| -rw-r--r-- | docs/release/configguide/postinstall.rst | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/docs/release/configguide/configguide.rst b/docs/release/configguide/configguide.rst index 209f6cb4..9db0ab30 100644 --- a/docs/release/configguide/configguide.rst +++ b/docs/release/configguide/configguide.rst @@ -24,4 +24,14 @@ Scenario 4: Kubernetes with OVN Scenario 5: Openstack with Opencontrail --------------------------------------- -*./deploy.sh -o ocata -s ocl -t ha -l custom -f none -d xenial -m openstack* +*./deploy.sh -o pike -s ocl -t ha -l custom -f none -d xenial -m openstack* + +Scenario 6: Kubernetes Load Balancer with Canal CNI +--------------------------------------------------- + +*./deploy.sh -s canal -l custom -f lb -m kubernetes* + +Scenario 7: Kubernetes Load Balancer with Ceph +---------------------------------------------- + +*./deploy.sh -l custom -f lb,ceph -m kubernetes* diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst index aee4ce25..86e33093 100644 --- a/docs/release/configguide/installerconfig.rst +++ b/docs/release/configguide/installerconfig.rst @@ -189,7 +189,7 @@ opnfv: release: d distro: xenial type: noha - openstack: newton + openstack: pike sdncontroller: - type: nosdn storage: @@ -244,10 +244,10 @@ When it's done, you should be able to view MAAS webpage (http://<MAAS IP>/MAAS) OPNFV Install ------------- -| `` ./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack`` +| `` ./deploy.sh -o pike -s nosdn -t noha -l custom -f none -d xenial -m openstack`` | `` `` -./deploy.sh -o newton -s nosdn -t noha -l custom -f none -d xenial -m openstack +./deploy.sh -o pike -s nosdn -t noha -l custom -f none -d xenial -m openstack NOTE: Possible options are as follows: @@ -263,9 +263,9 @@ Mode of Openstack deployed. ha: HA mode of openstack. Wihch version of Openstack deployed. - [-o|--openstack <ocata|newton>] + [-o|--openstack <pike|ocata>] + pike: Pike version of openstack. Ocata: Ocata version of openstack. - Newton: Newton version of openstack. Where to deploy [-l|--lab <custom | default>] etc... diff --git a/docs/release/configguide/postinstall.rst b/docs/release/configguide/postinstall.rst index 49388b16..519eb4fb 100644 --- a/docs/release/configguide/postinstall.rst +++ b/docs/release/configguide/postinstall.rst @@ -6,7 +6,7 @@ Configure OpenStack openstack.sh under joid/ci used to configure the openstack after deployment -./openstack.sh <nosdn> custom xenial newton +./openstack.sh <nosdn> custom xenial pike Below commands are used to setup domain in heat. juju run-action heat/0 domain-setup |