From 6afb7794346307c9f276b49796c43e99c4fba604 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 29 Mar 2017 12:32:45 -0400 Subject: Euphrates Docs update w odl scenario name cleanups - updating docs to reference Euphrates - removing the odl_l2-nofeature scenario, it's obsolete - renameing odl_l3 to odl, it's default for odl now - adding symlinks to files to _l3 files so CI doesn't break will remote those once CI is updated to use new names Change-Id: I9f2646fc5dac443042c5f4be8cca7d2df5dca663 Signed-off-by: Dan Radez --- config/deploy/deploy_settings.yaml | 2 +- config/deploy/os-odl-csit-noha.yaml | 12 +++++++++ config/deploy/os-odl-fdio-ha.yaml | 37 ++++++++++++++++++++++++++++ config/deploy/os-odl-fdio-noha.yaml | 37 ++++++++++++++++++++++++++++ config/deploy/os-odl-nofeature-ha.yaml | 11 +++++++++ config/deploy/os-odl-nofeature-noha.yaml | 11 +++++++++ config/deploy/os-odl-ovs-ha.yaml | 27 ++++++++++++++++++++ config/deploy/os-odl-ovs-noha.yaml | 27 ++++++++++++++++++++ config/deploy/os-odl_l2-nofeature-ha.yaml | 1 - config/deploy/os-odl_l3-csit-noha.yaml | 13 +--------- config/deploy/os-odl_l3-fdio-ha.yaml | 38 +---------------------------- config/deploy/os-odl_l3-fdio-noha.yaml | 38 +---------------------------- config/deploy/os-odl_l3-nofeature-ha.yaml | 12 +-------- config/deploy/os-odl_l3-nofeature-noha.yaml | 12 +-------- config/deploy/os-odl_l3-ovs-ha.yaml | 28 +-------------------- config/deploy/os-odl_l3-ovs-noha.yaml | 28 +-------------------- 16 files changed, 170 insertions(+), 164 deletions(-) create mode 100644 config/deploy/os-odl-csit-noha.yaml create mode 100644 config/deploy/os-odl-fdio-ha.yaml create mode 100644 config/deploy/os-odl-fdio-noha.yaml create mode 100644 config/deploy/os-odl-nofeature-ha.yaml create mode 100644 config/deploy/os-odl-nofeature-noha.yaml create mode 100644 config/deploy/os-odl-ovs-ha.yaml create mode 100644 config/deploy/os-odl-ovs-noha.yaml delete mode 120000 config/deploy/os-odl_l2-nofeature-ha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-csit-noha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-fdio-ha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-fdio-noha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-nofeature-ha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-nofeature-noha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-ovs-ha.yaml mode change 100644 => 120000 config/deploy/os-odl_l3-ovs-noha.yaml (limited to 'config/deploy') diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index c92a1754..aedd1979 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -81,7 +81,7 @@ deploy_options: # # This is currently the only available option in the nova section. It will # # add the provided string to vcpu_pin_set in nova.conf. This is used to pin # # guest VMs to a set of CPU cores, and is decsribed in more detail here: - # # http://docs.openstack.org/newton/config-reference/compute/config-options.html + # # http://docs.openstack.org/ocata/config-reference/compute/config-options.html # libvirtpin: 1 # kernel: # # On compute nodes, isolcpus is usually used to reserve cores for use either by VMs diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml new file mode 100644 index 00000000..ad61e26b --- /dev/null +++ b/config/deploy/os-odl-csit-noha.yaml @@ -0,0 +1,12 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: false + congress: false + sfc: false + vpn: false + ceph: false diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml new file mode 100644 index 00000000..af81e5a5 --- /dev/null +++ b/config/deploy/os-odl-fdio-ha.yaml @@ -0,0 +1,37 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: carbon + odl_vpp_routing_node: overcloud-novacompute-0 + tacker: true + congress: true + sfc: false + vpn: false + vpp: true + dataplane: fdio + performance: + Controller: + kernel: + hugepages: 1024 + hugepagesz: 2M + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml new file mode 100644 index 00000000..adb37f3d --- /dev/null +++ b/config/deploy/os-odl-fdio-noha.yaml @@ -0,0 +1,37 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: carbon + odl_vpp_routing_node: overcloud-novacompute-0 + tacker: true + congress: true + sfc: false + vpn: false + vpp: true + dataplane: fdio + performance: + Controller: + kernel: + hugepages: 1024 + hugepagesz: 2M + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml new file mode 100644 index 00000000..d421c7ca --- /dev/null +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -0,0 +1,11 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml new file mode 100644 index 00000000..972b1f85 --- /dev/null +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -0,0 +1,11 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false diff --git a/config/deploy/os-odl-ovs-ha.yaml b/config/deploy/os-odl-ovs-ha.yaml new file mode 100644 index 00000000..ad265699 --- /dev/null +++ b/config/deploy/os-odl-ovs-ha.yaml @@ -0,0 +1,27 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false + dataplane: ovs_dpdk + performance: + Controller: + kernel: + hugepagesz: 2M + hugepages: 1024 + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/deploy/os-odl-ovs-noha.yaml b/config/deploy/os-odl-ovs-noha.yaml new file mode 100644 index 00000000..6f7630dc --- /dev/null +++ b/config/deploy/os-odl-ovs-noha.yaml @@ -0,0 +1,27 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false + dataplane: ovs_dpdk + performance: + Controller: + kernel: + hugepagesz: 2M + hugepages: 1024 + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + ovs: + socket_memory: 1024 + pmd_cores: 2 + dpdk_cores: 1 diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml deleted file mode 120000 index dc20f6fe..00000000 --- a/config/deploy/os-odl_l2-nofeature-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -os-odl_l3-nofeature-ha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl_l3-csit-noha.yaml deleted file mode 100644 index ad61e26b..00000000 --- a/config/deploy/os-odl_l3-csit-noha.yaml +++ /dev/null @@ -1,12 +0,0 @@ -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - odl_version: boron - sdn_l3: true - tacker: false - congress: false - sfc: false - vpn: false - ceph: false diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl_l3-csit-noha.yaml new file mode 120000 index 00000000..06ddcde4 --- /dev/null +++ b/config/deploy/os-odl_l3-csit-noha.yaml @@ -0,0 +1 @@ +os-odl-csit-noha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl_l3-fdio-ha.yaml deleted file mode 100644 index af81e5a5..00000000 --- a/config/deploy/os-odl_l3-fdio-ha.yaml +++ /dev/null @@ -1,37 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: true - odl_version: carbon - odl_vpp_routing_node: overcloud-novacompute-0 - tacker: true - congress: true - sfc: false - vpn: false - vpp: true - dataplane: fdio - performance: - Controller: - kernel: - hugepages: 1024 - hugepagesz: 2M - intel_iommu: 'on' - iommu: pt - isolcpus: 1,2 - vpp: - main-core: 1 - corelist-workers: 2 - uio-driver: uio_pci_generic - Compute: - kernel: - hugepagesz: 2M - hugepages: 2048 - intel_iommu: 'on' - iommu: pt - isolcpus: 1,2 - vpp: - main-core: 1 - corelist-workers: 2 - uio-driver: uio_pci_generic diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl_l3-fdio-ha.yaml new file mode 120000 index 00000000..42bed3dd --- /dev/null +++ b/config/deploy/os-odl_l3-fdio-ha.yaml @@ -0,0 +1 @@ +os-odl-fdio-ha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl_l3-fdio-noha.yaml deleted file mode 100644 index adb37f3d..00000000 --- a/config/deploy/os-odl_l3-fdio-noha.yaml +++ /dev/null @@ -1,37 +0,0 @@ -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - sdn_l3: true - odl_version: carbon - odl_vpp_routing_node: overcloud-novacompute-0 - tacker: true - congress: true - sfc: false - vpn: false - vpp: true - dataplane: fdio - performance: - Controller: - kernel: - hugepages: 1024 - hugepagesz: 2M - intel_iommu: 'on' - iommu: pt - isolcpus: 1,2 - vpp: - main-core: 1 - corelist-workers: 2 - uio-driver: uio_pci_generic - Compute: - kernel: - hugepagesz: 2M - hugepages: 2048 - intel_iommu: 'on' - iommu: pt - isolcpus: 1,2 - vpp: - main-core: 1 - corelist-workers: 2 - uio-driver: uio_pci_generic diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl_l3-fdio-noha.yaml new file mode 120000 index 00000000..d8b983eb --- /dev/null +++ b/config/deploy/os-odl_l3-fdio-noha.yaml @@ -0,0 +1 @@ +os-odl-fdio-noha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml deleted file mode 100644 index d421c7ca..00000000 --- a/config/deploy/os-odl_l3-nofeature-ha.yaml +++ /dev/null @@ -1,11 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - odl_version: boron - sdn_l3: true - tacker: true - congress: true - sfc: false - vpn: false diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml new file mode 120000 index 00000000..0334fae9 --- /dev/null +++ b/config/deploy/os-odl_l3-nofeature-ha.yaml @@ -0,0 +1 @@ +os-odl-nofeature-ha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml deleted file mode 100644 index 972b1f85..00000000 --- a/config/deploy/os-odl_l3-nofeature-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - odl_version: boron - sdn_l3: true - tacker: true - congress: true - sfc: false - vpn: false diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml new file mode 120000 index 00000000..62220520 --- /dev/null +++ b/config/deploy/os-odl_l3-nofeature-noha.yaml @@ -0,0 +1 @@ +os-odl-nofeature-noha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-ovs-ha.yaml b/config/deploy/os-odl_l3-ovs-ha.yaml deleted file mode 100644 index ad265699..00000000 --- a/config/deploy/os-odl_l3-ovs-ha.yaml +++ /dev/null @@ -1,27 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - odl_version: boron - sdn_l3: true - tacker: true - congress: true - sfc: false - vpn: false - dataplane: ovs_dpdk - performance: - Controller: - kernel: - hugepagesz: 2M - hugepages: 1024 - Compute: - kernel: - hugepagesz: 2M - hugepages: 2048 - intel_iommu: 'on' - iommu: pt - ovs: - socket_memory: 1024 - pmd_cores: 2 - dpdk_cores: 1 diff --git a/config/deploy/os-odl_l3-ovs-ha.yaml b/config/deploy/os-odl_l3-ovs-ha.yaml new file mode 120000 index 00000000..fc68a750 --- /dev/null +++ b/config/deploy/os-odl_l3-ovs-ha.yaml @@ -0,0 +1 @@ +os-odl-ovs-ha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-ovs-noha.yaml b/config/deploy/os-odl_l3-ovs-noha.yaml deleted file mode 100644 index 6f7630dc..00000000 --- a/config/deploy/os-odl_l3-ovs-noha.yaml +++ /dev/null @@ -1,27 +0,0 @@ -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - odl_version: boron - sdn_l3: true - tacker: true - congress: true - sfc: false - vpn: false - dataplane: ovs_dpdk - performance: - Controller: - kernel: - hugepagesz: 2M - hugepages: 1024 - Compute: - kernel: - hugepagesz: 2M - hugepages: 2048 - intel_iommu: 'on' - iommu: pt - ovs: - socket_memory: 1024 - pmd_cores: 2 - dpdk_cores: 1 diff --git a/config/deploy/os-odl_l3-ovs-noha.yaml b/config/deploy/os-odl_l3-ovs-noha.yaml new file mode 120000 index 00000000..9301ced2 --- /dev/null +++ b/config/deploy/os-odl_l3-ovs-noha.yaml @@ -0,0 +1 @@ +os-odl-ovs-noha.yaml \ No newline at end of file -- cgit 1.2.3-korg