summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml134
-rw-r--r--deploy/scenario/no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml108
-rw-r--r--deploy/scenario/scenario.yaml41
3 files changed, 269 insertions, 14 deletions
diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
new file mode 100644
index 000000000..c6f221284
--- /dev/null
+++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
@@ -0,0 +1,134 @@
+##############################################################################
+# 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 with VLAN segmentation
+ version: 0.0.1
+ created: Jan 12 2016
+ comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, HA deployment
+
+##############################################################################
+# 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:
+ environment:
+ mode: ha
+ net_segment_type: vlan
+ name: opnfv-vlan-noha
+ wanted_release: Kilo on Ubuntu 14.04
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: mongo,controller
+ transformations: transformations_1
+ - id: 2
+ interfaces: interfaces_1
+ role: mongo,controller
+ transformations: transformations_1
+ - id: 3
+ interfaces: interfaces_1
+ role: mongo,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:
+ additional_components:
+ ceilometer:
+ description: If selected, Ceilometer component will be installed
+ label: Install Ceilometer
+ type: checkbox
+ value: true
+ weight: 40
+ heat:
+ description: ''
+ label: ''
+ type: hidden
+ value: true
+ weight: 30
+ metadata:
+ label: Additional Components
+ weight: 20
+ storage:
+ 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
+ of all types of Ceph backed VMs (without this option, live migration will
+ only work with VMs launched from Cinder volumes).
+ label: Ceph RBD for ephemeral volumes (Nova)
+ type: checkbox
+ value: true
+ weight: 75
+ images_ceph:
+ description: Configures Glance to use the Ceph RBD backend to store images.
+ If enabled, this option will prevent Swift from installing.
+ label: Ceph RBD for images (Glance)
+ restrictions:
+ - settings:storage.images_vcenter.value == true: Only one Glance backend could
+ be selected.
+ type: checkbox
+ value: true
+ weight: 30
+
+dha-override-config:
+# These overrides only take effect for virtual deployment scenarios
+ 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_vlan_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
new file mode 100644
index 000000000..9e9aa0821
--- /dev/null
+++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
@@ -0,0 +1,108 @@
+##############################################################################
+# 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 with VLAN segmentation
+ version: 0.0.1
+ created: Jan 12 2016
+ comment: Fuel OpenStack-only with VLAN segmentation, Ceph, Ceilometer and Heat, No-HA deployment
+
+##############################################################################
+# 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:
+ environment:
+ mode: ha
+ net_segment_type: vlan
+ name: opnfv-vlan-noha
+ wanted_release: Kilo on Ubuntu 14.04
+ 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
+ settings:
+ editable:
+ additional_components:
+ ceilometer:
+ description: If selected, Ceilometer component will be installed
+ label: Install Ceilometer
+ type: checkbox
+ value: true
+ weight: 40
+ heat:
+ description: ''
+ label: ''
+ type: hidden
+ value: true
+ weight: 30
+ metadata:
+ label: Additional Components
+ weight: 20
+ storage:
+ 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
+ of all types of Ceph backed VMs (without this option, live migration will
+ only work with VMs launched from Cinder volumes).
+ label: Ceph RBD for ephemeral volumes (Nova)
+ type: checkbox
+ value: true
+ weight: 75
+ images_ceph:
+ description: Configures Glance to use the Ceph RBD backend to store images.
+ If enabled, this option will prevent Swift from installing.
+ label: Ceph RBD for images (Glance)
+ restrictions:
+ - settings:storage.images_vcenter.value == true: Only one Glance backend could
+ be selected.
+ type: checkbox
+ value: true
+ weight: 30
+
+dha-override-config:
+# These overrides only take effect for virtual deployment scenarios
+
+##############################################################################
+# 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 707049f47..69b82f1aa 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -11,46 +11,59 @@
# Description:
# This configuration file defines translation between a short deployment
# scenario name and an actual deployment scenario configuration file
+#
+# Short deployment scenario names are aligned between installer, test, and
+# releng projects according to below pattern.
+# os-[controller]-[feature]-[mode](-[optionalparameter])
+#
+# Please note that the mechanism to get the details regarding the scenarios
+# is different currently which needs to be aligned as well.
##############################################################################
-os_ha:
+os-nosdn-nofeature-ha:
configfile: ha_heat_ceilometer_scenario_0.0.1.yaml
-os_no-ha:
+os-nosdn-nofeature-noha:
configfile: no-ha_heat_ceilometer_scenario_0.0.1.yaml
-os_odl-l3_ha:
+os-nosdn-vlan-ha:
+ configfile: ha_vlan_heat_ceilometer_scenario_0.0.1.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.1.yaml
-os_odl-l3_no-ha:
+os-odl_l3-nofeature-noha:
configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
-os_odl-l2_ha:
+os-odl_l2-nofeature-ha:
configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
-os_odl-l2_no-ha:
+os-odl_l2-nofeature-noha:
configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
-os_onos_ha:
+os-onos-nofeature-ha:
configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml
-os_onos_no-ha:
+os-onos-nofeature-noha:
configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
-os_kvm_ha:
+os-nosdn-kvm-ha:
configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
-os_kvm_no-ha:
+os-nosdn-kvm-noha:
configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
-os_ovs_ha:
+os-nosdn-ovs-ha:
configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
-os_ovs_no-ha:
+os-nosdn-ovs-noha:
configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
-os_kvm_ovs_ha:
+os-nosdn-kvm_ovs-ha:
configfile:
-os_kvm_ovs_no-ha:
+os-nosdn-kvm_ovs-noha:
configfile: no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml