diff options
| -rw-r--r-- | docs/development/design/index.rst (renamed from docs/developer/design/index.rst) | 0 | ||||
| -rw-r--r-- | docs/development/design/multicast.rst (renamed from docs/developer/design/multicast.rst) | 0 | ||||
| -rw-r--r-- | docs/development/requirements/multicast.rst (renamed from docs/developer/spec/multicast.rst) | 0 | ||||
| -rw-r--r-- | docs/release/configguide/index.rst (renamed from docs/configurationguide/index.rst) | 0 | ||||
| -rw-r--r-- | docs/release/configguide/installerconfig.rst (renamed from docs/configurationguide/installerconfig.rst) | 0 | ||||
| -rw-r--r-- | docs/release/installation/bmdeploy.rst (renamed from docs/installationprocedure/bmdeploy.rst) | 10 | ||||
| -rw-r--r-- | docs/release/installation/index.rst (renamed from docs/installationprocedure/index.rst) | 0 | ||||
| -rw-r--r-- | docs/release/installation/installation_guide.rst (renamed from docs/installationprocedure/installation_guide.rst) | 0 | ||||
| -rw-r--r-- | docs/release/installation/introduction.rst (renamed from docs/installationprocedure/introduction.rst) | 0 | ||||
| -rw-r--r-- | docs/release/installation/vmdeploy.rst (renamed from docs/installationprocedure/vmdeploy.rst) | 12 | ||||
| -rw-r--r-- | docs/release/release-notes/index.rst (renamed from docs/releasenotes/index.rst) | 0 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst (renamed from docs/releasenotes/release-notes.rst) | 0 |
12 files changed, 17 insertions, 5 deletions
diff --git a/docs/developer/design/index.rst b/docs/development/design/index.rst index bc5e9f40..bc5e9f40 100644 --- a/docs/developer/design/index.rst +++ b/docs/development/design/index.rst diff --git a/docs/developer/design/multicast.rst b/docs/development/design/multicast.rst index 89422fe6..89422fe6 100644 --- a/docs/developer/design/multicast.rst +++ b/docs/development/design/multicast.rst diff --git a/docs/developer/spec/multicast.rst b/docs/development/requirements/multicast.rst index ba314d3a..ba314d3a 100644 --- a/docs/developer/spec/multicast.rst +++ b/docs/development/requirements/multicast.rst diff --git a/docs/configurationguide/index.rst b/docs/release/configguide/index.rst index 7b531f45..7b531f45 100644 --- a/docs/configurationguide/index.rst +++ b/docs/release/configguide/index.rst diff --git a/docs/configurationguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst index 795f6028..795f6028 100644 --- a/docs/configurationguide/installerconfig.rst +++ b/docs/release/configguide/installerconfig.rst diff --git a/docs/installationprocedure/bmdeploy.rst b/docs/release/installation/bmdeploy.rst index 38790290..47a8e121 100644 --- a/docs/installationprocedure/bmdeploy.rst +++ b/docs/release/installation/bmdeploy.rst @@ -46,8 +46,13 @@ E.g. OpenStack only deployment roles setting roles: - COMPUTER + +NOTE: +For B/M, Daisy uses MAC address defined in deploy.yml to map discovered nodes to node items definition in deploy.yml, then assign role described by node item to the discovered nodes by name pattern. Currently, controller01, controller02, and controller03 will be assigned with Controler role while computer01, 'computer02, computer03, and computer04 will be assigned with Compute role. + NOTE: -WE JUST SUPPORT ONE CONTROLLER NODE NOW. +For V/M, There is no MAC address defined in deploy.yml for each virtual machine. Instead, Daisy will fill that blank by getting MAC from "virsh dump-xml". + Network Configuration (Bare Metal Deployment) ------------------------------------------ @@ -116,7 +121,8 @@ You can write your own reference into it. -Note: For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions. +Note: +For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions. HeartBeat network is selected,and if it is configured in network.yml,the keepalived interface will be the heartbeat interface. Start Deployment (Bare Metal Deployment) diff --git a/docs/installationprocedure/index.rst b/docs/release/installation/index.rst index 8c5a3da7..8c5a3da7 100644 --- a/docs/installationprocedure/index.rst +++ b/docs/release/installation/index.rst diff --git a/docs/installationprocedure/installation_guide.rst b/docs/release/installation/installation_guide.rst index 5afd73aa..5afd73aa 100644 --- a/docs/installationprocedure/installation_guide.rst +++ b/docs/release/installation/installation_guide.rst diff --git a/docs/installationprocedure/introduction.rst b/docs/release/installation/introduction.rst index 4781ab7d..4781ab7d 100644 --- a/docs/installationprocedure/introduction.rst +++ b/docs/release/installation/introduction.rst diff --git a/docs/installationprocedure/vmdeploy.rst b/docs/release/installation/vmdeploy.rst index 2ed6b001..3812a40e 100644 --- a/docs/installationprocedure/vmdeploy.rst +++ b/docs/release/installation/vmdeploy.rst @@ -42,7 +42,10 @@ E.g. OpenStack only deployment roles setting - compute NOTE: -WE JUST SUPPORT ONE CONTROLLER NODE NOW. +For B/M, Daisy uses MAC address defined in deploy.yml to map discovered nodes to node items definition in deploy.yml, then assign role described by node item to the discovered nodes by name pattern. Currently, controller01, controller02, and controller03 will be assigned with Controler role while computer01, 'computer02, computer03, and computer04 will be assigned with Compute role. + +NOTE: +For V/M, There is no MAC address defined in deploy.yml for each virtual machine. Instead, Daisy will fill that blank by getting MAC from "virsh dump-xml". E.g. OpenStack and ceph deployment roles setting @@ -121,7 +124,8 @@ You can write your own reference into it. -Note: For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions. +Note: +For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions. HeartBeat network is selected,and if it is configured in network.yml,the keepalived interface will be the heartbeat interface. Start Deployment (Virtual Deployment) @@ -136,7 +140,9 @@ Start Deployment (Virtual Deployment) (4) Create folder of labs/zte/virtual1/daisy/config in daisy4nfv code dir (5) Move the daisy/deploy/config/vm_environment/zte-virtual1/deploy.yml and daisy/deploy/config/vm_environment/zte-virtual1/network.yml to labs/zte/virtual1/daisy/config dir. -Notes:zte-virtual1 config file is just for all-in-one deployment,if you want to deploy openstack with five node(1 lb node and 4 computer nodes),change the zte-virtual1 to zte-virtual2 + +Note: +zte-virtual1 config file is just for all-in-one deployment,if you want to deploy openstack with five node(1 lb node and 4 computer nodes),change the zte-virtual1 to zte-virtual2 (6) Run the script deploy.sh in daisy/ci/deploy/ with command: sudo ./ci/deploy/deploy.sh -b ../daisy -l zte -p virtual1 -s os-nosdn-nofeature-noha diff --git a/docs/releasenotes/index.rst b/docs/release/release-notes/index.rst index 0da52b5f..0da52b5f 100644 --- a/docs/releasenotes/index.rst +++ b/docs/release/release-notes/index.rst diff --git a/docs/releasenotes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 629d05de..629d05de 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst |