diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-26 23:37:23 +0100 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-29 13:58:49 +0000 |
commit | 3d6ec0d08c858d55eb478f03d2b1e60f9a522981 (patch) | |
tree | 0fe6c9e7f0aaf6303bd8a8e0e98d4b28177f93ca | |
parent | 1a560c19021ff232b7869b3057af4bcc46145b40 (diff) |
Rebasement of Fuel8 deployment configuration files and scenarios
Note:
- Lab configurations removed
- Most of the POD configuration files resides in the securedlab repo
- The securedlab repo is very restricive, cause it carries Lab internal
secrets
TODO:
- Ericsson virt is not yet rebased
- Intel virt is not yet rebased
- LF-POD2 is not yet rebased
- Deployment scenarios for vsperf, NFVOVS, NFVKVM, ONOS, VSPERF, BGPVPN is not yet rebased
NOT VERIFIED
DO NOT MERGE
Change-Id: I59d96acb26c06abf60c254fae8ea2ced332e5884
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit c43ed292f38dd9d26ee1efb02f0871501aa64dc9)
23 files changed, 2002 insertions, 311 deletions
diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index d3188a1af..7c56e4bae 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -1,18 +1,16 @@ dea-base-config-metadata: title: 'Deployment Environment Adapter Base configuration' # DEA API version supported - version: '0.1' - created: 'Mon Dec 28 2015' - comment: 'None' + version: '0.2' + created: 'Mon Jan 26 2016' + comment: 'Rebased for Fuel 8' environment: - mode: ha net_segment_type: tun -wanted_release: Kilo on Ubuntu 14.04 fuel: FUEL_ACCESS: password: admin user: admin - HOSTNAME: fuel +wanted_release: Liberty on Ubuntu 14.04 settings: editable: access: @@ -26,6 +24,7 @@ settings: value: admin@localhost weight: 40 metadata: + group: general label: Access weight: 10 password: @@ -42,7 +41,7 @@ settings: label: Tenant regex: error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$)(?!.* + source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.* +.*$).+ type: text value: admin @@ -52,7 +51,7 @@ settings: label: Username regex: error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$)(?!.* + source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.* +.*$).+ type: text value: admin @@ -62,15 +61,27 @@ settings: description: If selected, Ceilometer component will be installed label: Install Ceilometer type: checkbox - value: false - weight: 40 + value: true + weight: 60 heat: description: '' label: '' type: hidden value: true - weight: 30 + weight: 50 + ironic: + description: If selected, Ironic component will be installed + label: Install Ironic + restrictions: + - cluster:net_provider != 'neutron' or networking_parameters:segmentation_type != 'vlan': Ironic + requires Neutron with VLAN segmentation. + - settings:storage.images_ceph.value == true and settings:storage.objects_ceph.value == false: Ironic + requires Swift or RadosGW for Glance images. + type: checkbox + value: false + weight: 80 metadata: + group: openstack_services label: Additional Components weight: 20 mongo: @@ -80,13 +91,35 @@ settings: - settings:additional_components.ceilometer.value == false type: checkbox value: false - weight: 40 + weight: 70 murano: description: If selected, Murano component will be installed label: Install Murano type: checkbox value: false weight: 20 + murano-cfapi: + description: If selected, Murano service broker will be installed + label: Install Murano service broker for Cloud Foundry + restrictions: + - condition: settings:additional_components.murano.value == false + message: Murano should be enabled + - action: hide + condition: not ('experimental' in version:feature_groups) + type: checkbox + value: false + weight: 30 + murano_glance_artifacts_plugin: + description: If selected glance artifact repository will be enabled + label: Enable glance artifact repository + restrictions: + - condition: settings:additional_components.murano.value == false + message: Murano should be enabled + - action: hide + condition: not ('experimental' in version:feature_groups) + type: checkbox + value: false + weight: 40 sahara: description: If selected, Sahara component will be installed label: Install Sahara @@ -96,6 +129,7 @@ settings: common: auth_key: description: Public key(s) to include in authorized_keys on deployed nodes + group: security label: Public Key type: textarea value: '' @@ -103,6 +137,7 @@ settings: auto_assign_floating_ip: description: If selected, OpenStack will automatically assign a floating IP to a new instance + group: network label: Auto assign floating IP restrictions: - action: hide @@ -113,11 +148,13 @@ settings: debug: description: Debug logging mode provides more information, but requires more disk space. + group: logging label: OpenStack debug logging type: checkbox - value: false + value: true weight: 20 libvirt_type: + group: compute label: Hypervisor type type: radio value: kvm @@ -132,17 +169,19 @@ settings: weight: 30 metadata: label: Common - weight: 30 + weight: 10 nova_quota: description: Quotas are used to limit CPU and memory usage for tenants. Enabling quotas will increase load on the Nova database. + group: compute label: Nova quotas type: checkbox value: false - weight: 25 + weight: 30 puppet_debug: description: Debug puppet logging mode provides more information, but requires more disk space. + group: logging label: Puppet debug logging type: checkbox value: true @@ -153,21 +192,32 @@ settings: previous state. If the guest was running a restart will be attempted when nova-compute starts. If the guest was not running previously, a restart will not be attempted. + group: compute label: Resume guests state on host boot type: checkbox value: true - weight: 60 + weight: 50 + task_deploy: + description: Enables new deployment engine based on cross-node dependencies + for deployment tasks which allows to deploy all nodes simultaneously. Works + only for deployment tasks with version >= 2.0.0. + label: Enable task based deploy + restrictions: + - action: hide + condition: not ('experimental' in version:feature_groups) + type: checkbox + value: false + weight: 11 use_cow_images: description: For most cases you will want qcow format. If it's disabled, raw image format will be used to run VMs. OpenStack with raw format currently does not support snapshotting. + group: storage label: Use qcow format for images type: checkbox value: true - weight: 50 + weight: 60 use_vcenter: - restrictions: - - condition: cluster:net_provider == 'nova_network' type: hidden value: false weight: 30 @@ -179,6 +229,7 @@ settings: value: 226.94.1.1 weight: 10 metadata: + group: general label: Corosync restrictions: - action: hide @@ -207,6 +258,7 @@ settings: value: '' weight: 30 metadata: + group: openstack_services label: External MongoDB restrictions: - action: hide @@ -253,12 +305,13 @@ settings: label: Initial parameters type: text value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset - weight: 45 metadata: + group: general label: Kernel parameters - weight: 40 + weight: 60 murano_settings: metadata: + group: openstack_services label: Murano Settings restrictions: - action: hide @@ -273,11 +326,12 @@ settings: weight: 10 neutron_advanced_configuration: metadata: + group: network label: Neutron Advanced Configuration restrictions: - action: hide condition: cluster:net_provider != 'neutron' - weight: 45 + weight: 20 neutron_dvr: description: Enable Distributed Virtual Routers in Neutron label: Neutron DVR @@ -297,9 +351,24 @@ settings: type: checkbox value: false weight: 10 + neutron_l3_ha: + description: 'Enable High Availability features for Virtual Routers in Neutron + + Requires at least 2 Controller nodes to function properly + + ' + label: Neutron L3 HA + restrictions: + - condition: settings:neutron_advanced_configuration.neutron_dvr.value == + true + message: Neutron DVR must be disabled in order to use Neutron L3 HA + type: checkbox + value: false + weight: 30 neutron_mellanox: metadata: enabled: true + group: network label: Mellanox Neutron components restrictions: - action: hide @@ -343,6 +412,7 @@ settings: weight: 70 provision: metadata: + group: general label: Provision restrictions: - action: hide @@ -360,11 +430,12 @@ settings: value: true weight: 10 metadata: + group: network label: Public network assignment restrictions: - action: hide condition: cluster:net_provider != 'neutron' - weight: 50 + weight: 10 public_ssl: cert_data: description: Certificate and private key data, concatenated into a single @@ -414,6 +485,7 @@ settings: value: public.fuel.local weight: 50 metadata: + group: security label: Public TLS weight: 110 services: @@ -425,6 +497,7 @@ settings: repo_setup: metadata: always_editable: true + group: general label: Repositories weight: 50 repos: @@ -438,7 +511,7 @@ settings: Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror. - For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops). + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html#external-ubuntu-ops). ' extra_priority: null @@ -446,52 +519,52 @@ settings: value: - name: ubuntu priority: null - section: main + section: main universe multiverse suite: trusty type: deb - uri: http://10.20.0.2:8080/ubuntu-part + uri: http://archive.ubuntu.com/ubuntu/ - name: ubuntu-updates priority: null - section: main - suite: trusty + section: main universe multiverse + suite: trusty-updates type: deb - uri: http://10.20.0.2:8080/ubuntu-part + uri: http://archive.ubuntu.com/ubuntu/ - name: ubuntu-security priority: null - section: main - suite: trusty + section: main universe multiverse + suite: trusty-security type: deb - uri: http://10.20.0.2:8080/ubuntu-part + uri: http://archive.ubuntu.com/ubuntu/ - name: mos priority: 1050 section: main restricted - suite: mos7.0 + suite: mos8.0 type: deb - uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/x86_64 + uri: http://10.20.0.2:8080/liberty-8.0/ubuntu/x86_64 - name: mos-updates priority: 1050 section: main restricted - suite: mos7.0-updates + suite: mos8.0-updates type: deb - uri: http://10.20.0.2:8080/mos-ubuntu + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - name: mos-security priority: 1050 section: main restricted - suite: mos7.0-security + suite: mos8.0-security type: deb - uri: http://10.20.0.2:8080/mos-ubuntu + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - name: mos-holdback priority: 1100 section: main restricted - suite: mos7.0-holdback + suite: mos8.0-holdback type: deb - uri: http://10.20.0.2:8080/mos-ubuntu + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - name: Auxiliary priority: 1150 section: main restricted suite: auxiliary type: deb - uri: http://10.20.0.2:8080/2015.1.0-7.0/ubuntu/auxiliary + uri: http://10.20.0.2:8080/liberty-8.0/ubuntu/auxiliary storage: ephemeral_ceph: description: Configures Nova to store ephemeral volumes in RBD. This works @@ -500,7 +573,7 @@ settings: only work with VMs launched from Cinder volumes). label: Ceph RBD for ephemeral volumes (Nova) type: checkbox - value: true + value: false weight: 75 images_ceph: description: Configures Glance to use the Ceph RBD backend to store images. @@ -510,12 +583,12 @@ settings: - settings:storage.images_vcenter.value == true: Only one Glance backend could be selected. type: checkbox - value: true + value: false weight: 30 images_vcenter: description: Configures Glance to use the vCenter/ESXi backend to store images. If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) + label: VMware vCenter/ESXi datastore for images (Glance) restrictions: - action: hide condition: settings:common.use_vcenter.value != true @@ -538,16 +611,15 @@ settings: value: false weight: 11 metadata: - label: Storage + group: storage + label: Storage Backends weight: 60 objects_ceph: description: Configures RadosGW front end for Ceph RBD. This exposes S3 and Swift API Interfaces. If enabled, this option will prevent Swift from installing. label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false type: checkbox - value: true + value: false weight: 80 osd_pool_size: description: Configures the default number of object replicas in Ceph. This @@ -558,13 +630,23 @@ settings: error: Invalid number source: ^[1-9]\d*$ type: text - value: '2' + value: '3' weight: 85 + volumes_block_device: + description: High performance block device storage. It is recommended to have + at least one Storage - Cinder Block Device + label: Cinder Block device driver + restrictions: + - settings:storage.volumes_ceph.value == true + type: checkbox + value: false + weight: 15 volumes_ceph: description: Configures Cinder to store volumes in Ceph RBD images. label: Ceph RBD for volumes (Cinder) restrictions: - - settings:storage.volumes_lvm.value == true + - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value + == true type: checkbox value: true weight: 20 @@ -581,6 +663,7 @@ settings: type: hidden value: true metadata: + group: general label: Workloads Collector User restrictions: - action: hide @@ -588,7 +671,7 @@ settings: weight: 10 password: type: password - value: YqvwqNhL + value: AqEF1Aid1T5vGhP2WE7K5Yxx tenant: type: text value: services 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 6056f0409..eca91dfd8 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,37 +1,32 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Default version' - version: '0.2' - created: 'Wed 20 2016' - comment: 'Updated DNS and NTP for Internet use' + version: '0.3' + created: 'Jan 26 2016' + comment: 'Rebased for Fuel8' environment: - name: opnfv_virt + name: MyVirtFuel8 fuel: ADMIN_NETWORK: - cidr: 10.20.0.0/24 - dhcp_gateway: 10.20.0.2 dhcp_pool_end: 10.20.0.254 dhcp_pool_start: 10.20.0.3 ipaddress: 10.20.0.2 - netmask: 255.255.0.0 + netmask: 255.255.255.0 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: 0.ubuntu.pool.ntp.org NTP2: 1.ubuntu.pool.ntp.org NTP3: 2.ubuntu.pool.ntp.org interfaces_1: - eth0: + ens3: - fuelweb_admin - management - eth1: + ens4: - storage - eth2: + ens5: - private - eth3: + ens6: - public transformations_1: transformations: @@ -56,28 +51,49 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: ens3 - action: add-port bridge: br-mgmt - name: eth0.101 + name: ens3.101 - action: add-port bridge: br-storage - name: eth1.102 + name: ens4.102 - action: add-port bridge: br-mesh - name: eth2.103 + name: ens5.103 - action: add-port bridge: br-ex - name: eth3 + name: ens6 +transformations_2: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-mesh + - action: add-port + bridge: br-fw-admin + name: ens3 + - action: add-port + bridge: br-mgmt + name: ens3.101 + - action: add-port + bridge: br-storage + name: ens4.102 + - action: add-port + bridge: br-mesh + name: ens5.103 network: - management_vip: 192.168.0.2 - management_vrouter_vip: 192.168.0.1 networking_parameters: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - 8.8.8.8 - 8.8.4.4 + floating_name: admin_floating_net floating_ranges: - - 172.16.0.130 - 172.16.0.254 @@ -86,6 +102,7 @@ network: - 65535 internal_cidr: 192.168.111.0/24 internal_gateway: 192.168.111.1 + internal_name: admin_internal_net net_l23_provider: ovs segmentation_type: tun vlan_range: @@ -116,6 +133,23 @@ network: vlan_start: null name: public vlan_start: null + - cidr: 192.168.1.0/24 + gateway: null + ip_ranges: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.0/24 + configurable: true + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 102 - cidr: 192.168.0.0/24 gateway: null ip_ranges: @@ -136,23 +170,6 @@ network: vlan_start: 101 name: management vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.1 - - 192.168.1.254 - meta: - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - cidr: 192.168.2.0/24 gateway: null ip_ranges: @@ -171,7 +188,7 @@ network: vlan_start: 103 name: private vlan_start: 103 - - cidr: 10.20.0.0/16 + - cidr: 10.20.0.0/24 gateway: 10.20.0.2 ip_ranges: - - 10.20.0.3 @@ -186,37 +203,6 @@ network: use_gateway: true name: fuelweb_admin vlan_start: null - public_vip: 172.16.0.3 - public_vrouter_vip: 172.16.0.2 - vips: - management: - ipaddr: 192.168.0.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.16.0.3 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.0.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.16.0.2 - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller settings: editable: external_dns: @@ -230,12 +216,14 @@ settings: value: 8.8.8.8,8.8.4.4 weight: 10 metadata: + group: network label: Host OS DNS Servers - weight: 90 + weight: 30 external_ntp: metadata: + group: network label: Host OS NTP Servers - weight: 100 + weight: 40 ntp_list: description: List of upstream NTP servers, separated by comma label: NTP server list @@ -247,7 +235,10 @@ settings: weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -261,6 +252,9 @@ settings: syslog_server: description: Remote syslog hostname label: Hostname + regex: + error: Invalid hostname + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ type: text value: '' weight: 10 diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml index 26c4d2b16..dd4f85070 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml @@ -1,8 +1,8 @@ dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version - version: 0.0.1 - created: Jan 7 2016 - comment: Default version + version: 0.0.2 + created: Jan 26 2016 + comment: Default Fuel8 version # Adapter to use for this definition adapter: libvirt @@ -35,4 +35,4 @@ virtNetConfDir: templates/virtual_environment/networks disks: fuel: 50G controller: 100G - compute: 50G + compute: 100G diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml index 7fc429b84..fdbe202d3 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml @@ -1,19 +1,19 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Ericsson ELX version' - version: '0.1' - created: 'Mon Dec 30 2015' - comment: 'None' + version: '0.2' + created: 'Mon Jan 26 2016' + comment: 'Rebased for Fuel8' environment: name: opnfv_virt interfaces_1: - eth0: + ens3: - fuelweb_admin - management - eth1: + ens4: - storage - eth2: + ens5: - private - eth3: + ens6: - public transformations_1: transformations: @@ -38,45 +38,61 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: ens3 - action: add-port bridge: br-mgmt - name: eth0.101 + name: ens3.101 - action: add-port bridge: br-storage - name: eth1.102 + name: ens4.102 - action: add-port bridge: br-mesh - name: eth2.103 + name: ens5.103 - action: add-port bridge: br-ex - name: eth3 + name: ens6 +transformations_2: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-mesh + - action: add-port + bridge: br-fw-admin + name: ens3 + - action: add-port + bridge: br-mgmt + name: ens3.101 + - action: add-port + bridge: br-storage + name: ens4.102 + - action: add-port + bridge: br-mesh + name: ens5.103 fuel: ADMIN_NETWORK: - cidr: 10.20.0.0/24 - dhcp_gateway: 10.20.0.2 dhcp_pool_end: 10.20.0.254 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 + netmask: 255.255.255.0 + DNS_DOMAIN: opnfv.org + DNS_SEARCH: opnfv.org DNS_UPSTREAM: 147.214.6.234 - FUEL_ACCESS: - password: admin - user: admin HOSTNAME: opnfv_virt NTP1: 193.181.14.10 NTP2: 193.181.14.11 - NTP3: null + NTP3: '' network: - management_vip: 192.168.0.2 - management_vrouter_vip: 192.168.0.1 networking_parameters: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - 147.214.6.234 + floating_name: admin_floating_net floating_ranges: - - 172.16.0.130 - 172.16.0.254 @@ -85,6 +101,7 @@ network: - 65535 internal_cidr: 192.168.111.0/24 internal_gateway: 192.168.111.1 + internal_name: admin_internal_net net_l23_provider: ovs segmentation_type: tun vlan_range: @@ -115,6 +132,23 @@ network: vlan_start: null name: public vlan_start: null + - cidr: 192.168.1.0/24 + gateway: null + ip_ranges: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.0/24 + configurable: true + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 102 - cidr: 192.168.0.0/24 gateway: null ip_ranges: @@ -135,23 +169,6 @@ network: vlan_start: 101 name: management vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.1 - - 192.168.1.254 - meta: - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - cidr: 192.168.2.0/24 gateway: null ip_ranges: @@ -170,7 +187,7 @@ network: vlan_start: 103 name: private vlan_start: 103 - - cidr: 10.20.0.0/16 + - cidr: 10.20.0.0/24 gateway: 10.20.0.2 ip_ranges: - - 10.20.0.3 @@ -185,37 +202,6 @@ network: use_gateway: true name: fuelweb_admin vlan_start: null - public_vip: 172.16.0.3 - public_vrouter_vip: 172.16.0.2 - vips: - management: - ipaddr: 192.168.0.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.16.0.3 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.0.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.16.0.2 - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller settings: editable: external_dns: @@ -229,12 +215,14 @@ settings: value: 147.214.6.234 weight: 10 metadata: + group: network label: Host OS DNS Servers - weight: 90 + weight: 30 external_ntp: metadata: + group: network label: Host OS NTP Servers - weight: 100 + weight: 40 ntp_list: description: List of upstream NTP servers, separated by comma label: NTP server list @@ -246,7 +234,10 @@ settings: weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -260,6 +251,9 @@ settings: syslog_server: description: Remote syslog hostname label: Hostname + regex: + error: Invalid hostname + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ type: text value: '' weight: 10 @@ -274,4 +268,4 @@ settings: - data: tcp description: '' label: TCP - weight: 30
\ No newline at end of file + weight: 30 diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml index fc0e93a4f..6b5a30735 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -1,8 +1,8 @@ dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version - version: 0.0.1 - created: Dececember 30 2015 - comment: ELX version + version: 0.0.2 + created: Jan 26 2016 + comment: ELX Fuel8 version # Adapter to use for this definition adapter: libvirt @@ -35,4 +35,4 @@ virtNetConfDir: templates/virtual_environment/networks disks: fuel: 50G controller: 100G - compute: 50G + compute: 100G diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml index 6bbc0f236..a76dce65f 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml @@ -1,37 +1,32 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Huawei-China version' - version: '0.1' - created: 'Sun 10 2016' - comment: 'None' + version: '0.2' + created: 'Jan 26 2016' + comment: 'Rebased to Fuel8' environment: - name: opnfv_virt + name: MyVirtFuel8 fuel: ADMIN_NETWORK: - cidr: 10.20.0.0/24 - dhcp_gateway: 10.20.0.2 dhcp_pool_end: 10.20.0.254 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 + netmask: 255.255.255.0 + DNS_DOMAIN: opnfv.org + DNS_SEARCH: opnfv.org DNS_UPSTREAM: 114.114.114.114 - FUEL_ACCESS: - password: admin - user: admin HOSTNAME: opnfv_virt NTP1: 202.120.2.101 NTP2: 83.168.200.199 NTP3: 81.170.152.66 interfaces_1: - eth0: + ens3: - fuelweb_admin - management - eth1: + ens4: - storage - eth2: + ens5: - private - eth3: + ens6: - public transformations_1: transformations: @@ -56,28 +51,49 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: ens3 - action: add-port bridge: br-mgmt - name: eth0.101 + name: ens3.101 - action: add-port bridge: br-storage - name: eth1.102 + name: ens4.102 - action: add-port bridge: br-mesh - name: eth2.103 + name: ens5.103 - action: add-port bridge: br-ex - name: eth3 + name: ens6 +transformations_2: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-mesh + - action: add-port + bridge: br-fw-admin + name: ens3 + - action: add-port + bridge: br-mgmt + name: ens3.101 + - action: add-port + bridge: br-storage + name: ens4.102 + - action: add-port + bridge: br-mesh + name: ens5.103 network: - management_vip: 192.168.0.2 - management_vrouter_vip: 192.168.0.1 networking_parameters: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - 8.8.8.8 - 114.114.114.114 + floating_name: admin_floating_net floating_ranges: - - 172.16.0.130 - 172.16.0.254 @@ -86,6 +102,7 @@ network: - 65535 internal_cidr: 192.168.111.0/24 internal_gateway: 192.168.111.1 + internal_name: admin_internal_net net_l23_provider: ovs segmentation_type: tun vlan_range: @@ -116,6 +133,23 @@ network: vlan_start: null name: public vlan_start: null + - cidr: 192.168.1.0/24 + gateway: null + ip_ranges: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.0/24 + configurable: true + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 102 - cidr: 192.168.0.0/24 gateway: null ip_ranges: @@ -136,23 +170,6 @@ network: vlan_start: 101 name: management vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.1 - - 192.168.1.254 - meta: - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - cidr: 192.168.2.0/24 gateway: null ip_ranges: @@ -171,7 +188,7 @@ network: vlan_start: 103 name: private vlan_start: 103 - - cidr: 10.20.0.0/16 + - cidr: 10.20.0.0/24 gateway: 10.20.0.2 ip_ranges: - - 10.20.0.3 @@ -186,37 +203,6 @@ network: use_gateway: true name: fuelweb_admin vlan_start: null - public_vip: 172.16.0.3 - public_vrouter_vip: 172.16.0.2 - vips: - management: - ipaddr: 192.168.0.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.16.0.3 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.0.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.16.0.2 - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller settings: editable: external_dns: @@ -230,12 +216,14 @@ settings: value: 114.114.114.114, 8.8.8.8, 8.8.4.4 weight: 10 metadata: + group: network label: Host OS DNS Servers - weight: 90 + weight: 30 external_ntp: metadata: + group: network label: Host OS NTP Servers - weight: 100 + weight: 40 ntp_list: description: List of upstream NTP servers, separated by comma label: NTP server list @@ -247,7 +235,10 @@ settings: weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -261,6 +252,9 @@ settings: syslog_server: description: Remote syslog hostname label: Hostname + regex: + error: Invalid hostname + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ type: text value: '' weight: 10 diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml index 26c4d2b16..5b64d2c3f 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml @@ -1,8 +1,8 @@ dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version - version: 0.0.1 - created: Jan 7 2016 - comment: Default version + version: 0.0.2 + created: Jan 26 2015 + comment: Huawei-Ch Fuel8 version # Adapter to use for this definition adapter: libvirt @@ -35,4 +35,4 @@ virtNetConfDir: templates/virtual_environment/networks disks: fuel: 50G controller: 100G - compute: 50G + compute: 100G diff --git a/deploy/config/plugins/fuel-odl_0.0.2.yaml b/deploy/config/plugins/fuel-odl_0.0.2.yaml new file mode 100644 index 000000000..a53e863c5 --- /dev/null +++ b/deploy/config/plugins/fuel-odl_0.0.2.yaml @@ -0,0 +1,82 @@ +plugin-config-metadata: + title: OpenDaylight fuel Plugin configuration template + version: 0.2 + created: Tue Jan 26 2016 + comment: Rebased to Fuel8 and BE ODL plugin +opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + 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: false + 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 + - odl-vpnservice-openstack + # 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 diff --git a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..8ab5f9277 --- /dev/null +++ b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,91 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: OpenStack-only, HA deployment + version: 0.0.3 + created: Jan 26 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo, controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..b653cad5c --- /dev/null +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,97 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: NFV KVM HA deployment + version: 0.0.3 + created: Jan 28 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: fuel-plugin-qemu + module-config-name: fuel-nfvkvm + module-config-version: 0.0.1 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..22cd91df9 --- /dev/null +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,96 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: NFV OVS HA deployment + version: 0.0.3 + created: Jan 29 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: fuel-plugin-ovsnfv + module-config-name: fuel-nfvovs + module-config-version: 0.0.1 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..14316df2d --- /dev/null +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,182 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L2 HA deployment + version: 0.0.3 + created: Jan 26 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: +# Note that the module substitionion does not support arrays +# This is a quick fix +# - module: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.2 +# module-config-override: + # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: false +# enable_sfc: +# value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + 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: false + 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 + - odl-vpnservice-openstack + # 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 + +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..96623309b --- /dev/null +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,107 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 HA deployment + version: 0.0.3 + created: Jan 26 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: opendaylight + module-config-name: fuel-odl + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + rest_api_port: + value: '8282' + enable_gbp: + value: false + enable_l3_odl: + value: true + enable_sfc: + value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml new file mode 100644 index 000000000..0f09ca478 --- /dev/null +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml @@ -0,0 +1,185 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 HA deployment + version: 0.0.4 + created: Jan 28 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +# Note that the module substitionion does not support arrays +# This is a quick fix +stack-extensions: +# - module: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.2 +# module-config-override: +# # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: true +# enable_sfc: +# value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + 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 + - odl-vpnservice-openstack + # 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 + +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml new file mode 100644 index 000000000..a115bb643 --- /dev/null +++ b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ONOS HA deployment + version: 0.0.4 + created: Jan 29 2016 + comment: Rebased to Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: onos + module-config-name: fuel-onos + module-config-version: 0.0.2 + module-config-override: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + settings: + editable: + common: + libvirt_type: + # ONOS requires QEMU + value: qemu + public_network_assignment: + assign_to_all_nodes: + # ONOS should not have public network assignment to all nodes + value: false +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..c21585979 --- /dev/null +++ b/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: OpenStack-only, No-HA deployment + version: 0.0.2 + created: Jan 26 2016 + comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, No-HA deployment rebased with Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..74e20c2d6 --- /dev/null +++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: NFV KVM NO-HA deployment + version: 0.0.2 + created: Jan 28 2016 + comment: NFV KVM NO-HA Rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: fuel-plugin-qemu + module-config-name: fuel-nfvkvm + module-config-version: 0.0.1 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..18986a839 --- /dev/null +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,72 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: NFV OVS NO-HA deployment + version: 0.0.2 + created: Jan 29 2016 + comment: NFV OVS NO-HA Rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: fuel-plugin-ovsnfv + module-config-name: fuel-nfvovs + module-config-version: 0.0.1 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..0cc1258b7 --- /dev/null +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,159 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L2 No-HA deployment + version: 0.0.2 + created: Jan 26 2016 + comment: Fuel ODL-L2 No HA with Ceph, Ceilometer and Heat Rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: +# Note that the module substitionion does not support arrays +# This is a quick fix +# - module: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.2 +# module-config-override: +# # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: false +# enable_sfc: +# value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + 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: false + 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 + - odl-vpnservice-openstack + # 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 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..414aacaf1 --- /dev/null +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,83 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 No-HA deployment + version: 0.0.2 + created: Jan 26 2016 + comment: Fuel ODL-L3 No HA with Ceph, Ceilometer and Heat rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: opendaylight + module-config-name: fuel-odl + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + rest_api_port: + value: '8282' + enable_gbp: + value: false + enable_l3_odl: + value: true + enable_sfc: + value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..2ba2d6d75 --- /dev/null +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,161 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 No-HA deployment + version: 0.0.3 + created: Jan 28 2016 + comment: Fuel ODL-L3 No HA with Ceph, Ceilometer and Heat rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +# Note that the module substitionion does not support arrays +# This is a quick fix +stack-extensions: +# - module: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.2 +# module-config-override: + # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: true +# enable_sfc: +# value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + 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 + - odl-vpnservice-openstack + # 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 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..c7eea4e59 --- /dev/null +++ b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,82 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ONOS No-HA deployment + version: 0.0.3 + created: Jan 29 2016 + comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel8 + +############################################################################## +# Stack extentions are opnfv added value features in form of a fuel-plugin +# plug-ins listed below will be enabled and configured according to the +# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: onos + module-config-name: fuel-onos + module-config-version: 0.0.2 + module-config-override: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + name: onos_no-ha + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + settings: + editable: + common: + libvirt_type: + # ONOS requires QEMU + value: qemu + public_network_assignment: + assign_to_all_nodes: + # ONOS should not have public network assignment to all nodes + value: false +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml index 6090ef04a..0a13be576 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -29,61 +29,46 @@ ############################################################################## os-nosdn-nofeature-ha: - configfile: ha_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-nofeature-noha: - configfile: no-ha_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml os-nosdn-vlan-ha: - configfile: ha_vlan_heat_ceilometer_scenario_0.0.2.yaml os-nosdn-vlan-noha: - configfile: no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml os-odl_l3-nofeature-ha: - configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml os-odl_l3-nofeature-noha: - configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml os-odl_l2-nofeature-ha: - configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml os-odl_l2-nofeature-noha: - configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml os-onos-nofeature-ha: - configfile: ha_onos_heat_ceilometer_scenario_0.0.3.yaml + configfile: ha_onos_heat_ceilometer_scenario_0.0.4.yaml os-onos-nofeature-noha: - configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml - -os-onos-nofeature-ha-virtual: - configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml - -os-onos-nofeature-noha-virtual: - configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml + configfile: no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-kvm-ha: - configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-kvm-noha: - configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml os-nosdn-ovs-ha: - configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-ovs-noha: - configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml - -os-nosdn-kvm_ovs-ha: - configfile: + configfile: no-ha_nfv-ovseat_ceilometer_scenario_0.0.2.yaml -os-nosdn-kvm_ovs-noha: - configfile: no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml os-odl_l2-bgpvpn-ha: - configfile: ha_odl-l2_bgpvpn_scenario_0.0.1.yaml os-odl_l2-bgpvpn-noha: - configfile: no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml |