diff options
Diffstat (limited to 'config')
28 files changed, 0 insertions, 142 deletions
diff --git a/config/build/build_settings.yaml b/config/build/build_settings.yaml deleted file mode 100644 index 5fd7a4eb..00000000 --- a/config/build/build_settings.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -build_params: - opendaylight: true - onos: false - ovs: true - odl_puppet: true - -opendaylight_config: - name: "OpenDaylight SFC" - method: zip - location: >- - https://www.dropbox.com/s/6w76eo7loltvvb5/ - openstack.net-virt-sfc-karaf-1.2.1-SNAPSHOT.zip - -onos_config: - name: "ONOS Base Controller" - method: rpm - location: https://www.example.com/onos.rpm - -ovs_config: - name: "OVS NSH Build" - method: rpm - location: https://www.example.com/ovs_nsh_noarch.rpm - -odl_puppet_config: - name: "Puppet to install ODL SFC" - method: git - location: https://github.com/puppet-opendaylight.git - version: "stable/liberty" diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index 7406fe6f..45324c4b 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -19,10 +19,6 @@ deploy_options: # is specified, carbon will be used. # odl_version: carbon - # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent - # and use ODL instead. - sdn_l3: false - # Whether to install and configure Tacker (VNF Manager) tacker: true diff --git a/config/deploy/os-nosdn-fdio-ha.yaml b/config/deploy/os-nosdn-fdio-ha.yaml index d8af12db..fa7a5b59 100644 --- a/config/deploy/os-nosdn-fdio-ha.yaml +++ b/config/deploy/os-nosdn-fdio-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml index 446ddfd1..8ace96f8 100644 --- a/config/deploy/os-nosdn-fdio-noha.yaml +++ b/config/deploy/os-nosdn-fdio-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-kvm-ha.yaml b/config/deploy/os-nosdn-kvm-ha.yaml index b01a8352..dedf7307 100644 --- a/config/deploy/os-nosdn-kvm-ha.yaml +++ b/config/deploy/os-nosdn-kvm-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-kvm-noha.yaml b/config/deploy/os-nosdn-kvm-noha.yaml index a9c8d976..1f1fc7c2 100644 --- a/config/deploy/os-nosdn-kvm-noha.yaml +++ b/config/deploy/os-nosdn-kvm-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml index 3c26b832..93a1fb6f 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index 2cd6633c..77e5d5e2 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml index 8e312216..94ffb9ab 100644 --- a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml +++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml index f28b0c49..ec6baa67 100644 --- a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml +++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml index f5d0656f..392d1a68 100644 --- a/config/deploy/os-nosdn-performance-ha.yaml +++ b/config/deploy/os-nosdn-performance-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: false - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml index bc05fa47..82b28788 100644 --- a/config/deploy/os-ocl-nofeature-ha.yaml +++ b/config/deploy/os-ocl-nofeature-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opencontrail - sdn_l3: false tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml index b55c4591..424ac64f 100644 --- a/config/deploy/os-odl-bgpvpn-ha.yaml +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: true odl_version: carbon tacker: false congress: true diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml index babb9314..53510a8f 100644 --- a/config/deploy/os-odl-bgpvpn-noha.yaml +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: true odl_version: carbon tacker: false congress: true diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml index 67bdec1c..661cc00d 100644 --- a/config/deploy/os-odl-csit-noha.yaml +++ b/config/deploy/os-odl-csit-noha.yaml @@ -5,7 +5,6 @@ global_params: deploy_options: sdn_controller: opendaylight odl_version: carbon - sdn_l3: true tacker: false congress: false sfc: false diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml index cb7643d1..c02b22be 100644 --- a/config/deploy/os-odl-fdio-ha.yaml +++ b/config/deploy/os-odl-fdio-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: true odl_version: carbon odl_vpp_routing_node: overcloud-novacompute-0 tacker: true diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml index 12c1fa6d..4aab0520 100644 --- a/config/deploy/os-odl-fdio-noha.yaml +++ b/config/deploy/os-odl-fdio-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: true odl_version: carbon odl_vpp_routing_node: overcloud-novacompute-0 tacker: true diff --git a/config/deploy/os-odl-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml index 03ca1034..b7e2e05e 100644 --- a/config/deploy/os-odl-gluon-noha.yaml +++ b/config/deploy/os-odl-gluon-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: true odl_version: carbon tacker: false congress: true diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index c4bce1c7..bab9d0ee 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -5,7 +5,6 @@ global_params: deploy_options: sdn_controller: opendaylight odl_version: carbon - sdn_l3: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index 0c9b4fb5..32014d05 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -5,7 +5,6 @@ global_params: deploy_options: sdn_controller: opendaylight odl_version: carbon - sdn_l3: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml index 8bf38e27..a314f8c7 100644 --- a/config/deploy/os-odl-ovs_dpdk-ha.yaml +++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml @@ -5,7 +5,6 @@ global_params: deploy_options: sdn_controller: opendaylight odl_version: carbon - sdn_l3: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml index 6d6be985..8a09ffa5 100644 --- a/config/deploy/os-odl-ovs_dpdk-noha.yaml +++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml @@ -5,7 +5,6 @@ global_params: deploy_options: sdn_controller: opendaylight odl_version: carbon - sdn_l3: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml deleted file mode 100644 index 68777db0..00000000 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - odl_version: carbon - 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_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml deleted file mode 100644 index ab23e975..00000000 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - odl_version: carbon - 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_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml deleted file mode 100644 index 8104e7ea..00000000 --- a/config/deploy/os-odl_l2-sfc-noha.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - odl_version: carbon - tacker: true - congress: true - sfc: true - vpn: false diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml index 542f6df7..0ad1bc10 100644 --- a/config/deploy/os-onos-nofeature-ha.yaml +++ b/config/deploy/os-onos-nofeature-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: onos - sdn_l3: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml index 2d68573c..90a2f43b 100644 --- a/config/deploy/os-onos-sfc-ha.yaml +++ b/config/deploy/os-onos-sfc-ha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: onos - sdn_l3: true tacker: true congress: true sfc: true diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-ovn-nofeature-noha.yaml index d2702c9c..8c8c5f97 100644 --- a/config/deploy/os-ovn-nofeature-noha.yaml +++ b/config/deploy/os-ovn-nofeature-noha.yaml @@ -4,7 +4,6 @@ global_params: deploy_options: sdn_controller: ovn - sdn_l3: false tacker: false congress: true sfc: false |