summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-06 21:55:44 -0400
committerFeng Pan <fpan@redhat.com>2017-08-11 14:58:29 -0400
commit6bfab6c7e79ed029a9102ff7b7955b0a71f13c6d (patch)
tree6c85b73daba19e230c740d68f95db2c654c1171c /config
parent240fb2eeb9398871e55703f9e62bc7fbb4e01162 (diff)
Add os-odl-fdio-dvr support
apex-tripleo-heat-templates: I6a83c9e2deeb0df9a3ab09a707c9c64aa84da55e apex-puppet-tripleo: I2025e3157b97b376b63002003ca17c7206aba546 JIRA: APEX-466 Change-Id: Iedb75994d35b5dc1dd5d5ce1a57277c8f3729dfd Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'config')
-rw-r--r--config/deploy/os-odl-fdio-dvr-ha.yaml36
-rw-r--r--config/deploy/os-odl-fdio-dvr-noha.yaml36
-rw-r--r--config/network/network_settings.yaml4
-rw-r--r--config/network/network_settings_v6.yaml4
-rw-r--r--config/network/network_settings_vlans.yaml4
-rw-r--r--config/network/network_settings_vpp.yaml4
6 files changed, 80 insertions, 8 deletions
diff --git a/config/deploy/os-odl-fdio-dvr-ha.yaml b/config/deploy/os-odl-fdio-dvr-ha.yaml
new file mode 100644
index 0000000..564cf0b
--- /dev/null
+++ b/config/deploy/os-odl-fdio-dvr-ha.yaml
@@ -0,0 +1,36 @@
+global_params:
+ ha_enabled: true
+
+deploy_options:
+ sdn_controller: opendaylight
+ odl_version: carbon
+ odl_vpp_routing_node: dvr
+ 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-dvr-noha.yaml b/config/deploy/os-odl-fdio-dvr-noha.yaml
new file mode 100644
index 0000000..24c433b
--- /dev/null
+++ b/config/deploy/os-odl-fdio-dvr-noha.yaml
@@ -0,0 +1,36 @@
+global_params:
+ ha_enabled: false
+
+deploy_options:
+ sdn_controller: opendaylight
+ odl_version: carbon
+ odl_vpp_routing_node: dvr
+ 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/network/network_settings.yaml b/config/network/network_settings.yaml
index 8875334..fe11a9b 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -78,7 +78,7 @@ networks:
# If empty entire range is usable.
# Cannot overlap with dhcp_range or introspection_range.
overcloud_ip_range:
- - 192.0.2.11
+ - 192.0.2.51
- 192.0.2.99
# Gateway (only needed when public_network is disabled)
gateway: 192.0.2.1
@@ -87,7 +87,7 @@ networks:
# DHCP range for the admin network, automatically provisioned if empty
dhcp_range:
- 192.0.2.2
- - 192.0.2.10
+ - 192.0.2.50
# Mapping of network configuration for Overcloud Nodes
nic_mapping:
# Mapping for compute profile (nodes assigned as Compute nodes)
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index 5725763..25aaee8 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -78,7 +78,7 @@ networks:
# If empty entire range is usable.
# Cannot overlap with dhcp_range or introspection_range.
overcloud_ip_range:
- - 192.0.2.11
+ - 192.0.2.51
- 192.0.2.99
# Gateway (only needed when public_network is disabled)
gateway: 192.0.2.1
@@ -87,7 +87,7 @@ networks:
# DHCP range for the admin network, automatically provisioned if empty
dhcp_range:
- 192.0.2.2
- - 192.0.2.10
+ - 192.0.2.50
# Mapping of network configuration for Overcloud Nodes
nic_mapping:
# Mapping for compute profile (nodes assigned as Compute nodes)
diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml
index be4dc66..345dbbd 100644
--- a/config/network/network_settings_vlans.yaml
+++ b/config/network/network_settings_vlans.yaml
@@ -78,7 +78,7 @@ networks:
# If empty entire range is usable.
# Cannot overlap with dhcp_range or introspection_range.
overcloud_ip_range:
- - 192.0.2.11
+ - 192.0.2.51
- 192.0.2.99
# Gateway (only needed when public_network is disabled)
gateway: 192.0.2.1
@@ -87,7 +87,7 @@ networks:
# DHCP range for the admin network, automatically provisioned if empty
dhcp_range:
- 192.0.2.2
- - 192.0.2.10
+ - 192.0.2.50
# Mapping of network configuration for Overcloud Nodes
nic_mapping:
# Mapping for compute profile (nodes assigned as Compute nodes)
diff --git a/config/network/network_settings_vpp.yaml b/config/network/network_settings_vpp.yaml
index f080af1..2f6bba5 100644
--- a/config/network/network_settings_vpp.yaml
+++ b/config/network/network_settings_vpp.yaml
@@ -78,7 +78,7 @@ networks:
# If empty entire range is usable.
# Cannot overlap with dhcp_range or introspection_range.
overcloud_ip_range:
- - 192.0.2.11
+ - 192.0.2.51
- 192.0.2.99
# Gateway (only needed when public_network is disabled)
gateway: 192.0.2.1
@@ -87,7 +87,7 @@ networks:
# DHCP range for the admin network, automatically provisioned if empty
dhcp_range:
- 192.0.2.2
- - 192.0.2.10
+ - 192.0.2.50
# Mapping of network configuration for Overcloud Nodes
nic_mapping:
# Mapping for compute profile (nodes assigned as Compute nodes)