diff options
Diffstat (limited to 'deploy/config')
| -rw-r--r-- | deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml | 20 | ||||
| -rw-r--r-- | deploy/config/plugins/fuel-odl_0.0.1.yaml | 124 |
2 files changed, 81 insertions, 63 deletions
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml index 2be68e25a..6056f0409 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml @@ -1,8 +1,8 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Default version' - version: '0.1' - created: 'Thu 7 2016' - comment: 'None' + version: '0.2' + created: 'Wed 20 2016' + comment: 'Updated DNS and NTP for Internet use' environment: name: opnfv_virt fuel: @@ -13,16 +13,16 @@ fuel: dhcp_pool_start: 10.20.0.3 ipaddress: 10.20.0.2 netmask: 255.255.0.0 - DNS_DOMAIN: opnfvericsson.se - DNS_SEARCH: opnfvericsson.se - DNS_UPSTREAM: 10.118.32.193 + DNS_DOMAIN: opnfv.org + DNS_SEARCH: opnfv.org + DNS_UPSTREAM: 8.8.8.8, 8.8.4.4 FUEL_ACCESS: password: admin user: admin HOSTNAME: opnfv_virt - NTP1: 81.170.152.66 - NTP2: 83.168.200.199 - NTP3: 78.108.60.252 + NTP1: 0.ubuntu.pool.ntp.org + NTP2: 1.ubuntu.pool.ntp.org + NTP3: 2.ubuntu.pool.ntp.org interfaces_1: eth0: - fuelweb_admin @@ -243,7 +243,7 @@ settings: error: Invalid NTP server list source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$ type: text - value: 81.170.152.66,83.168.200.199,78.108.60.252 + value: 0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org weight: 10 syslog: metadata: diff --git a/deploy/config/plugins/fuel-odl_0.0.1.yaml b/deploy/config/plugins/fuel-odl_0.0.1.yaml index 11622a16c..e1f743fbc 100644 --- a/deploy/config/plugins/fuel-odl_0.0.1.yaml +++ b/deploy/config/plugins/fuel-odl_0.0.1.yaml @@ -5,60 +5,78 @@ plugin-config-metadata: comment: None opendaylight: - enable_gbp: - label: GBP features - type: checkbox - value: false - weight: 14 - enable_l3_odl: - label: 'EXPERIMENTAL: Use ODL to manage L3 traffic' - type: checkbox - value: false - weight: 12 - enable_sfc: - label: SFC features - type: checkbox - value: false - weight: 13 metadata: + # chosen_id: Assigned during installation + class: plugin + default: false enabled: true - label: OpenDaylight Lithium plugin - odl_features: - default: - - config - - standard - - region - - package - - kar - - ssh - - management - gbp: - - odl-groupbasedpolicy-base - - odl-groupbasedpolicy-ofoverlay - ovs: - - odl-ovsdb-openstack - - odl-restconf-all - - odl-aaa-authn - - odl-dlux-all - sfc: - - odl-sfc-core - - odl-sfc-sb-rest - - odl-sfc-ui - - odl-sfc-netconf - - odl-sfc-ovs - - odl-sfcofl2 - - odl-sfc-test-consumer - # plugin_id: Assigned during installation - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + label: OpenDaylight plugin toggleable: true + versions: + - enable_gbp: + label: GBP features + type: checkbox + value: false + weight: 14 + enable_l3_odl: + label: Use ODL to manage L3 traffic + restrictions: + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes + type: checkbox + value: true + weight: 12 + enable_sfc: + label: SFC features + type: checkbox + value: false + weight: 13 + metadata: + always_editable: false + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + gbp: + - odl-groupbasedpolicy-base + - odl-groupbasedpolicy-ofoverlay + ovs: + - odl-ovsdb-openstack + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + sfc: + - odl-sfc-core + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + - odl-sfc-test-consumer + vpn: + - odl-vpnservice-api + - odl-vpnservice-impl + - odl-vpnservice-impl-rest + - odl-vpnservice-impl-ui + - odl-vpnservice-core + # plugin_id: Assigned during installation + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + rest_api_port: + description: Port on which ODL REST API will be available. + label: Port number + regex: + error: Invalid port number + source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ + type: text + value: '8282' + weight: 40 weight: 70 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 40 |