diff options
Diffstat (limited to 'config/deploy')
| -rw-r--r-- | config/deploy/deploy_settings.yaml | 6 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-sdnvpn-ha.yaml | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index ee1dc146..ea35ae70 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -14,9 +14,9 @@ deploy_options: sdn_controller: opendaylight # Which version of ODL to use. This is only valid if 'opendaylight' was used - # above. If 'Boron' is specified, ODL Boron will be used. If no value is specified, - # Lithium will be used. - #odl_version: Boron + # above. Valid options are 'beryllium', 'boron' and 'carbon'. If no value + # is specified, Beryllium will be used. + #odl_version: boron # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and # use ODL instead. diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml deleted file mode 100644 index f6904f05..00000000 --- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml +++ /dev/null @@ -1,10 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - tacker: true - congress: true - sfc: false - vpn: true |