diff options
| -rw-r--r-- | deploy/config/dea_base.yaml | 360 | ||||
| -rw-r--r-- | deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml | 111 | ||||
| -rw-r--r-- | deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml | 2 |
3 files changed, 304 insertions, 169 deletions
diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 15e3cb9d8..8d0214a59 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -10,9 +10,9 @@ dea-base-config-metadata: title: 'Deployment Environment Adapter Base configuration' # DEA API version supported - version: '0.3' - created: 'Tue Feb 2 2016' - comment: 'Rebased for Fuel 8' + version: '0.4' + created: 'Fri Jun 10 2016' + comment: 'Rebased for Fuel 9' environment: net_segment_type: tun fuel: @@ -34,7 +34,7 @@ settings: weight: 40 metadata: group: general - label: Access + label: OpenStack Access weight: 10 password: description: Password for Administrator @@ -67,8 +67,8 @@ settings: weight: 10 additional_components: ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer + description: If selected, Ceilometer and Aodh components will be installed + label: Install Ceilometer and Aodh type: checkbox value: true weight: 60 @@ -92,12 +92,14 @@ settings: metadata: group: openstack_services label: Additional Components - weight: 20 + weight: 10 mongo: description: If selected, You can use external Mongo DB as ceilometer backend label: Use external Mongo DB restrictions: - - settings:additional_components.ceilometer.value == false + - settings:additional_components.ceilometer.value == false: External Mongo + aims to be an external backend for Ceilometer. Without Ceilometer enabled, + External Mongo is useless and should not be installed. type: checkbox value: false weight: 70 @@ -118,29 +120,25 @@ settings: 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 type: checkbox value: false weight: 10 + cgroups: + metadata: + always_editable: true + group: general + label: Cgroups conguration for services + restrictions: + - action: hide + condition: 'true' + weight: 90 common: auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes group: security - label: Public Key - type: textarea + type: hidden value: '' weight: 70 auto_assign_floating_ip: @@ -160,13 +158,13 @@ settings: group: logging label: OpenStack debug logging type: checkbox - value: true + value: false weight: 20 libvirt_type: group: compute label: Hypervisor type type: radio - value: kvm + value: qemu values: - data: kvm description: Choose this type of hypervisor if you run OpenStack on hardware @@ -187,6 +185,10 @@ settings: type: checkbox value: false weight: 30 + propagate_task_deploy: + type: hidden + value: false + weight: 12 puppet_debug: description: Debug puppet logging mode provides more information, but requires more disk space. @@ -207,15 +209,8 @@ settings: value: true 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 + type: hidden + value: true weight: 11 use_cow_images: description: For most cases you will want qcow format. If it's disabled, raw @@ -274,7 +269,7 @@ settings: condition: settings:additional_components.mongo.value == false message: Ceilometer and MongoDB are not enabled on the Additional Components section - weight: 20 + weight: 30 mongo_db_name: description: Mongo database name label: Database name @@ -327,6 +322,12 @@ settings: condition: settings:additional_components.murano.value == false message: Murano is not enabled on the Additional Components section weight: 20 + murano_glance_artifacts_plugin: + description: If selected glance artifact repository will be enabled + label: Enable glance artifact repository + type: checkbox + value: true + weight: 40 murano_repo_url: description: '' label: Murano Repository URL @@ -374,62 +375,165 @@ settings: type: checkbox value: false weight: 30 - neutron_mellanox: + neutron_qos: + description: Enable Neutron QoS advanced service plug-in + label: Neutron QoS + type: checkbox + value: false + weight: 40 + operator_user: + authkeys: + description: Public SSH keys to include to operator user's authorized keys, + one per line. + label: Authorized SSH keys + type: textarea + value: '' + weight: 80 + homedir: + description: Home directory for operator user + label: Home directory + regex: + error: Invalid path + source: ^/\S + type: text + value: /home/fueladmin + weight: 70 metadata: - enabled: true - group: network - label: Mellanox Neutron components - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - toggleable: false + group: general + label: Operating System Access + weight: 15 + name: + description: Username for operator user + label: Username + regex: + error: Empty username + source: \S + type: text + value: fueladmin weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') + password: + description: Password for operator user + label: Password + regex: + error: Empty password + source: \S + type: password + value: mCKyMCwhzrt7d6E8WQzxg5WS weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 + sudo: + description: Sudoers configuration directives for operator user, one per line. + label: Sudoers configuration + type: textarea + value: 'ALL=(ALL) NOPASSWD: ALL' + weight: 90 provision: metadata: group: general label: Provision restrictions: - action: hide - condition: 'true' + condition: 'false' weight: 80 method: type: hidden value: image + packages: + label: Initial packages + type: textarea + value: 'acl + + anacron + + bash-completion + + bridge-utils + + bsdmainutils + + build-essential + + cloud-init + + curl + + daemonize + + debconf-utils + + gdisk + + grub-pc + + hpsa-dkms + + hwloc + + i40e-dkms + + linux-firmware + + linux-firmware-nonfree + + linux-headers-generic-lts-trusty + + linux-image-generic-lts-trusty + + lvm2 + + mcollective + + mdadm + + multipath-tools + + multipath-tools-boot + + nailgun-agent + + nailgun-mcagents + + network-checker + + ntp + + openssh-client + + openssh-server + + puppet + + python-amqp + + ruby-augeas + + ruby-ipaddress + + ruby-json + + ruby-netaddr + + ruby-openstack + + ruby-shadow + + ruby-stomp + + telnet + + ubuntu-minimal + + ubuntu-standard + + uuid-runtime + + vim + + virt-what + + vlan + + ' + weight: 10 public_network_assignment: assign_to_all_nodes: description: When disabled, public network will be assigned to controllers @@ -479,9 +583,12 @@ settings: horizon: description: Secure access to Horizon enabling HTTPS instead of HTTP label: HTTPS for Horizon + restrictions: + - settings:public_ssl.services.value == false: TLS for OpenStack public endpoints + should be enabled type: checkbox value: false - weight: 10 + weight: 20 hostname: description: Your DNS entries should point to this name. Self-signed certificates also will use this hostname @@ -502,7 +609,7 @@ settings: label: TLS for OpenStack public endpoints type: checkbox value: false - weight: 20 + weight: 10 repo_setup: metadata: always_editable: true @@ -520,8 +627,6 @@ 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-8.0/operations.html#external-ubuntu-ops). - ' extra_priority: null type: custom_repo_configuration @@ -531,32 +636,79 @@ settings: section: main universe multiverse suite: trusty type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ + uri: http://archive.ubuntu.com/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse suite: trusty-updates type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ + uri: http://archive.ubuntu.com/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse suite: trusty-security type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ + uri: http://archive.ubuntu.com/ubuntu/ - name: mos priority: 1050 section: main restricted - suite: mos8.0 + suite: mos9.0 + type: deb + uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 + - name: mos-updates + priority: 1050 + section: main restricted + suite: mos9.0-updates + type: deb + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ + - name: mos-security + priority: 1050 + section: main restricted + suite: mos9.0-security + type: deb + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ + - name: mos-holdback + priority: 1100 + section: main restricted + suite: mos9.0-holdback type: deb - uri: http://10.20.0.2:8080/liberty-8.0/ubuntu/x86_64 + uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - name: Auxiliary priority: 1150 section: main restricted suite: auxiliary type: deb - uri: http://10.20.0.2:8080/liberty-8.0/ubuntu/auxiliary + uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary + service_user: + homedir: + type: hidden + value: /var/lib/fuel + metadata: + group: general + label: Service user account + restrictions: + - action: hide + condition: 'true' + weight: 10 + name: + type: hidden + value: fuel + password: + type: hidden + value: sCTOC4CkNSTLuNKUQDNUV1Bp + root_password: + type: hidden + value: r00tme + sudo: + type: hidden + value: 'ALL=(ALL) NOPASSWD: ALL' storage: + admin_key: + type: hidden + value: AQDir1pXAAAAABAAm8r2rR0FuVsV8LRo6u9GgQ== + bootstrap_osd_key: + type: hidden + value: AQDir1pXAAAAABAAK5E2MNhWdIpOBzjXJTVqcg== ephemeral_ceph: description: Configures Nova to store ephemeral volumes in RBD. This works best if Ceph is enabled for volumes and images, too. Enables live migration @@ -566,6 +718,9 @@ settings: type: checkbox value: false weight: 75 + fsid: + type: hidden + value: 7a5db523-ae79-489d-b5d1-7a31fdaba6ef images_ceph: description: Configures Glance to use the Ceph RBD backend to store images. If enabled, this option will prevent Swift from installing. @@ -588,23 +743,13 @@ settings: type: checkbox value: false weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - - action: hide - condition: not ('experimental' in version:feature_groups) - type: checkbox - value: false - weight: 11 metadata: group: storage label: Storage Backends weight: 60 + mon_key: + type: hidden + value: AQDir1pXAAAAABAAp92Dw8/kmDdhMvpgaPMKiQ== 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. @@ -614,8 +759,8 @@ settings: weight: 80 osd_pool_size: description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. + number must be equal to or lower than the number of deployed 'Ceph OSD' + nodes. label: Ceph object replication factor regex: error: Invalid number @@ -623,9 +768,12 @@ settings: type: text value: '3' weight: 85 + radosgw_key: + type: hidden + value: AQDir1pXAAAAABAAUH+qP9FohG5wGr/+oQ2rFw== volumes_block_device: description: High performance block device storage. It is recommended to have - at least one Storage - Cinder Block Device + at least one Cinder Block Device label: Cinder Block device driver restrictions: - settings:storage.volumes_ceph.value == true @@ -642,14 +790,14 @@ settings: value: true weight: 20 volumes_lvm: - description: It is recommended to have at least one Storage - Cinder LVM node. + description: It is recommended to have at least one Cinder node. label: Cinder LVM over iSCSI for volumes restrictions: - settings:storage.volumes_ceph.value == true type: checkbox value: false weight: 10 - workloads_collector: +workloads_collector: enabled: type: hidden value: true @@ -662,7 +810,7 @@ settings: weight: 10 password: type: password - value: AqEF1Aid1T5vGhP2WE7K5Yxx + value: JWMZX9JjUK1g4AsC7tHvpXvm tenant: type: text value: services 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 8ede3d683..cf408f083 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 @@ -61,41 +61,23 @@ transformations_1: - action: add-port bridge: br-ex 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: dhcp_pool_end: 10.20.0.254 dhcp_pool_start: 10.20.0.3 ipaddress: 10.20.0.2 netmask: 255.255.255.0 - DNS_DOMAIN: opnfv.org - DNS_SEARCH: opnfv.org + ssh_network: 10.20.0.0/24 + DNS_DOMAIN: domain.tld + DNS_SEARCH: domain.tld DNS_UPSTREAM: 147.214.6.234 - HOSTNAME: opnfv_virt - NTP1: 193.181.14.10 - NTP2: 193.181.14.11 - NTP3: '' + FUEL_ACCESS: + password: admin + user: admin + HOSTNAME: fuel + NTP1: time1.ericsson.se + NTP2: time2.ericsson.se + NTP3: time2.ericsson.se network: networking_parameters: base_mac: fa:16:3e:00:00:00 @@ -118,30 +100,6 @@ network: - 1000 - 1030 networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vips: - - haproxy - - vrouter - vlan_start: null - name: public - vlan_start: null - cidr: 192.168.1.0/24 gateway: null ip_ranges: @@ -197,6 +155,30 @@ network: vlan_start: 103 name: private vlan_start: 103 + - cidr: 172.16.0.0/24 + gateway: 172.16.0.1 + ip_ranges: + - - 172.16.0.2 + - 172.16.0.126 + meta: + cidr: 172.16.0.0/24 + configurable: true + floating_range_var: floating_ranges + ip_range: + - 172.16.0.2 + - 172.16.0.126 + map_priority: 1 + name: public + notation: ip_ranges + render_addr_mask: public + render_type: null + use_gateway: true + vips: + - haproxy + - vrouter + vlan_start: null + name: public + vlan_start: null - cidr: 10.20.0.0/24 gateway: 10.20.0.2 ip_ranges: @@ -216,13 +198,15 @@ settings: editable: external_dns: dns_list: - description: List of upstream DNS servers, separated by comma + description: List of upstream DNS servers label: DNS list + max: 3 regex: - error: Invalid IP address list - source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$ - type: text - value: 147.214.6.234 + error: Invalid IP address + source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$ + type: text_list + value: + - 147.214.6.234 weight: 10 metadata: group: network @@ -234,13 +218,15 @@ settings: label: Host OS NTP Servers weight: 40 ntp_list: - description: List of upstream NTP servers, separated by comma + description: List of upstream NTP servers label: NTP server list regex: - error: Invalid NTP server list - source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$ - type: text - value: 193.181.14.10, 193.181.14.11 + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - time1.ericsson.se + - time2.ericsson.se weight: 10 syslog: metadata: @@ -279,3 +265,4 @@ settings: description: '' label: TCP 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 07faeb1f2..f9580124d 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -2,7 +2,7 @@ dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version version: 0.0.3 created: Feb 2 2016 - comment: ELX Fuel8 version + comment: ELX Fuel 9 version # Adapter to use for this definition adapter: libvirt |