summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-29 12:32:45 -0400
committerDan Radez <dradez@redhat.com>2017-03-30 08:08:10 -0400
commit6afb7794346307c9f276b49796c43e99c4fba604 (patch)
treec5658529b762814c816cfb3087b7c7babee3ece8 /config
parenta684f6b753749c355aee06412bd0f22779357089 (diff)
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 <dradez@redhat.com>
Diffstat (limited to 'config')
-rw-r--r--config/deploy/deploy_settings.yaml2
-rw-r--r--config/deploy/os-odl-csit-noha.yaml12
-rw-r--r--config/deploy/os-odl-fdio-ha.yaml37
-rw-r--r--config/deploy/os-odl-fdio-noha.yaml37
-rw-r--r--config/deploy/os-odl-nofeature-ha.yaml11
-rw-r--r--config/deploy/os-odl-nofeature-noha.yaml11
-rw-r--r--config/deploy/os-odl-ovs-ha.yaml27
-rw-r--r--config/deploy/os-odl-ovs-noha.yaml27
l---------config/deploy/os-odl_l2-nofeature-ha.yaml1
l---------[-rw-r--r--]config/deploy/os-odl_l3-csit-noha.yaml13
l---------[-rw-r--r--]config/deploy/os-odl_l3-fdio-ha.yaml38
l---------[-rw-r--r--]config/deploy/os-odl_l3-fdio-noha.yaml38
l---------[-rw-r--r--]config/deploy/os-odl_l3-nofeature-ha.yaml12
l---------[-rw-r--r--]config/deploy/os-odl_l3-nofeature-noha.yaml12
l---------[-rw-r--r--]config/deploy/os-odl_l3-ovs-ha.yaml28
l---------[-rw-r--r--]config/deploy/os-odl_l3-ovs-noha.yaml28
16 files changed, 170 insertions, 164 deletions
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
index ad61e26b..06ddcde4 100644..120000
--- a/config/deploy/os-odl_l3-csit-noha.yaml
+++ b/config/deploy/os-odl_l3-csit-noha.yaml
@@ -1,12 +1 @@
-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
+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
index af81e5a5..42bed3dd 100644..120000
--- a/config/deploy/os-odl_l3-fdio-ha.yaml
+++ b/config/deploy/os-odl_l3-fdio-ha.yaml
@@ -1,37 +1 @@
-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
+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
index adb37f3d..d8b983eb 100644..120000
--- a/config/deploy/os-odl_l3-fdio-noha.yaml
+++ b/config/deploy/os-odl_l3-fdio-noha.yaml
@@ -1,37 +1 @@
-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
+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
index d421c7ca..0334fae9 100644..120000
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -1,11 +1 @@
-global_params:
- ha_enabled: true
-
-deploy_options:
- sdn_controller: opendaylight
- odl_version: boron
- sdn_l3: true
- tacker: true
- congress: true
- sfc: false
- vpn: false
+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
index 972b1f85..62220520 100644..120000
--- a/config/deploy/os-odl_l3-nofeature-noha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-noha.yaml
@@ -1,11 +1 @@
-global_params:
- ha_enabled: false
-
-deploy_options:
- sdn_controller: opendaylight
- odl_version: boron
- sdn_l3: true
- tacker: true
- congress: true
- sfc: false
- vpn: false
+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
index ad265699..fc68a750 100644..120000
--- a/config/deploy/os-odl_l3-ovs-ha.yaml
+++ b/config/deploy/os-odl_l3-ovs-ha.yaml
@@ -1,27 +1 @@
-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
+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
index 6f7630dc..9301ced2 100644..120000
--- a/config/deploy/os-odl_l3-ovs-noha.yaml
+++ b/config/deploy/os-odl_l3-ovs-noha.yaml
@@ -1,27 +1 @@
-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
+os-odl-ovs-noha.yaml \ No newline at end of file