diff options
author | Julien <zhang.jun3g@zte.com.cn> | 2018-02-05 15:31:45 +0800 |
---|---|---|
committer | Julien <zhang.jun3g@zte.com.cn> | 2018-02-05 15:33:51 +0800 |
commit | 32cb06f2dfb92481feb0f02ef94fc745001963d4 (patch) | |
tree | 6859b4c245667a3fe5909173a2c6a9fe22ecd086 /scenarios/examples | |
parent | 77b600ef0d64210c1b5fd72581cfe7752fa00c8c (diff) |
Add SDF files in Octopus
Add SDF files in Octopus to scenarios sub-directories. In the future,
we will add schema files for SDF just like PDF/IDF.
Change-Id: I248834bc7fe91bfbd8afe4827905f6ebd4f7a5ab
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'scenarios/examples')
-rw-r--r-- | scenarios/examples/sdf-fdio-example.yaml | 134 | ||||
-rw-r--r-- | scenarios/examples/sdf-mano-example.yaml | 128 |
2 files changed, 262 insertions, 0 deletions
diff --git a/scenarios/examples/sdf-fdio-example.yaml b/scenarios/examples/sdf-fdio-example.yaml new file mode 100644 index 00000000..7ea0ba8a --- /dev/null +++ b/scenarios/examples/sdf-fdio-example.yaml @@ -0,0 +1,134 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei others. +# ulrich.kleber@huawei.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 an example for a specific scenario. +# It is derived from: +# apex/config/deploy/os-odl_l2-fdio-ha +############################################################################## + +############################################################################## +# scenario meta-data +scenario-metadata: + name: odl-fdio-devops + title: fdio odl basic for devops + generic-scenario: false + version: 1.0.0 + creation-date: 2017-03-16 + # This scenario introduces fd.io with odl and a basic feature set. + # It is derived from parent odl_l2 nofeature. In a next step, odl_l2 and + # old_l3 functionality shall be merged and provide sfc as well as other + # features. + # This scenario will use newer versions of ODL and other upstream components + # than used in Euphrates. It is planned to release it or DevOps use more + # often than regular OPNFV release cycle. + opnfv-release: colorado + opnfv-version: 3.1.0 # the first opnfv version, the scenario was introduced + owner: Frank Brockners, frank.brockners@cisco.com + # Add additional contact persons e.g. from installers or major components + +############################################################################## + +############################################################################## +# components +components: + - sdn-controller: + component-type: opendaylight + release: carbon + version: ">6.0.1" + features: + - odl_l2 + - vpp + - storage: + component-type: ceph + # $$$$ Should we add num-replicas 3 here? + + - cloud-controller: + type: openstack + release: ocata + modules: + - nova + - cinder + - dashboard + - glance + - heat + - neutron + - tacker + - congress + - dataplane: + type: fdio + release: xx + version: 9.9.9 + features: + - performance: + controller-nodes: + kernel: + hugepages: 1024 # decimal number + hugepagesz: 2M # values like 2M, 1G + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic + compute-nodes: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic +############################################################################## + +############################################################################## +# deployment options +deployment-options: + deployment-types: # only intel baremetal is supported + - baremetal: + architecture: x86_64 + availability: + - ha: # We support only HA + nodes: + - name: host1 + roles: + - openstack-controller # need to add fd.io? + - odl + - name: host2 + roles: + - openstack-controller + - odl + - name: host3 + roles: + - openstack-controller + - odl + - name: host4 # need to add fd.io? + roles: + - openstack-compute + - name: host5 + roles: + - openstack-compute + deployment-tools: + # fuel support shall be added soon + - apex: + cpu: intel + pod: baremetal + availability: ha +############################################################################## + +############################################################################## +# Prerequisites +# No other prerequisites +############################################################################## diff --git a/scenarios/examples/sdf-mano-example.yaml b/scenarios/examples/sdf-mano-example.yaml new file mode 100644 index 00000000..66063163 --- /dev/null +++ b/scenarios/examples/sdf-mano-example.yaml @@ -0,0 +1,128 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei and others. +# ulrich.kleber@huawei.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 is an example for a MANO scenario +# It illustrates how MANO components can test orchestration capabilities +# together with various infrastructure scenarios. +# This way, the SDF describes the MANO components (NFVO and VNFM) only. For +# the infrastructure (NFVI and VIM) part another scenario is just referenced; +# that scenario is deployed independently in a separate deployment step, and +# can be deployed even using a different installer tool. +# +# More details can be found in the scenario lifecycle document. +# http://artifacts.opnfv.org/octopus/docs/scenario-lifecycle/index.html +############################################################################## + +############################################################################## +# scenario meta-data: Metadata describing this sdf.yaml file and the +# scenario history and purpose, like in any other scenario descriptor +scenario-metadata: + name: orchestra-example + title: "orchestra main scenario" + generic-scenario: false + version: 1.0.3 + creation-date: 2017-07-13 + # This scenario integrates the main open-baton NFVO components to OPNFV + # infrastructure. + # In the first step, no sdn controller scenarios are supported, but only + # os-nosdn-nofeature and os-nosdn-ovs, installed by compass. + opnfv-release: euphrates + opnfv-version: + - begins: 5.1.0 + owner: Ulrich Kleber, ulrich.kleber@huawei.com + +############################################################################## + +############################################################################## +# components +components: + - nfvo: + type: open-baton + version: 3.0 + # here a list of optional features or artifacts to deploy could follow + + - vnfm: + type: juju + # juju doesn't have release name + version: 2.2 + + - opnfv-infrastructure: + release: euphrates # this determines also ocata as openstack version + version: 5.0.0 + scenarios: + - os-nosdn-nofeature: + options: + - availability: [HA, NOHA] + - tools: [compass, joid] + # this is for the example. In first step only joid will work + - os-nosdn-ovs: + options: + - availability: [HA, NOHA] + - tools: compass + +############################################################################## + +############################################################################## +# deployment options + +deployment-options: + deployment-types: + - baremetal: + architecture: x86_64 + + # $$$$ following proposal 2 from the template (patchset 6) + roles: + - jump-host: + components: + - open-baton + - juju-controller + - controller-node: + components: + - juju-client + # this is in addition to the components defined in the + # opnfv-infrastructure scenario. + - compute-node: # no additional component to be deployed here + + role-distribution: + - ha: + controller-node: 3 + compute-node: 2 + jump-host: 1 + - noha: + controller-node: 1 + compute-node: 4 + jump-host: 1 + + deployment-tools: + # Please note that the component "opnfv-infrastructure" specified their + # own deployment tools and options. Definition here is related only + # for the nfvo and vnfm components specified above. + + - joid: + cpu: intel + pod: baremetal + availability: HA + - joid: + cpu: intel + pod: baremetal + availability: NOHA + - joid: + cpu: intel + pod: virtual + availability: NOHA + +############################################################################## + +############################################################################## +# Prerequisites +prerequisites: + RAM: 128GB |