From 45598f5f98a4eae487f0f10b11c49f6a493615c3 Mon Sep 17 00:00:00 2001 From: Andrey Volochay Date: Mon, 21 Sep 2015 15:22:44 +0300 Subject: [PATCH] Adapt the plugin with Fuel 7.0 - migrate the plugin from 2.0.0 to 3.0.0 package version Change-Id: I2f0721b844f91374aea564cba4de53836d9e562d --- README.md | 6 +++++- tasks.yaml => deployment_tasks.yaml | 23 ++++++++++++++++------- metadata.yaml | 14 +++++++------- volumes.yaml | 7 +++++++ 4 files changed, 35 insertions(+), 15 deletions(-) rename tasks.yaml => deployment_tasks.yaml (53%) create mode 100644 volumes.yaml diff --git a/README.md b/README.md index d14e3cc..3970984 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Requirements | Requirement | Version/Comment | |------------------------------------------------------------------------------------------|---------------------------------------------------------| -| Mirantis Openstack compatibility | 6.1 | +| Mirantis Openstack compatibility | 7.0 | | Netapp filer or appliance is reacheble via one of the Mirantis OPenstack networks | Cluster mode or 7 mode storage familly with nfs4 enabled| @@ -325,6 +325,10 @@ None. Release Notes ------------- +**3.0.0** + +* migrate the plugin from 2.0.0 to 3.0.0 package version + **2.0.0** * migrate plugins from 1.0.0 to 2.0.0 package version diff --git a/tasks.yaml b/deployment_tasks.yaml similarity index 53% rename from tasks.yaml rename to deployment_tasks.yaml index 4339e01..eb33140 100644 --- a/tasks.yaml +++ b/deployment_tasks.yaml @@ -1,21 +1,30 @@ -- role: ['primary-controller','controller'] - stage: post_deployment/6000 +# Deployment tasks +- id: controller-netapp type: puppet + role: [primary-controller, controller] + required_for: [post_deployment_end] + requires: [post_deployment_start] parameters: puppet_manifest: puppet/manifests/site_controller.pp puppet_modules: "puppet/modules/:/etc/puppet/modules/" timeout: 360 -- role: ['compute'] - stage: post_deployment/6001 + +- id: compute-netapp type: puppet + role: [compute] + required_for: [post_deployment_end] + requires: [post_deployment_start] parameters: puppet_manifest: puppet/manifests/site_compute.pp puppet_modules: "puppet/modules/:/etc/puppet/modules/" timeout: 360 -- role: ['cinder'] - stage: post_deployment/6002 + +- id: cinder-netapp type: puppet + role: [cinder] + required_for: [post_deployment_end] + requires: [post_deployment_start] parameters: puppet_manifest: puppet/manifests/site_cinder.pp puppet_modules: "puppet/modules/:/etc/puppet/modules/" - timeout: 360 \ No newline at end of file + timeout: 360 diff --git a/metadata.yaml b/metadata.yaml index 0da686c..44ca02f 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -3,30 +3,30 @@ name: cinder_netapp # Human-readable name for your plugin title: Cinder and NetApp integration # Plugin version -version: 2.0.0 +version: 3.0.0 # Description description: Enable to use NetApp nfs driver as a Cinder backend # Required fuel version -fuel_version: ['6.1'] +fuel_version: ['7.0'] authors: ['Mirantis Inc','Orange'] -licenses: [Apache License Version 2.0] -homepage: https://github.com/stackforge/fuel-plugin-tls +licenses: ['Apache License Version 2.0'] +homepage: 'https://github.com/stackforge/fuel-plugin-cinder-netapp' groups: ['storage::cinder'] # The plugin is compatible with releases in the list releases: - os: ubuntu - version: 2014.2-6.1 + version: 2015.1.0-7.0 mode: ['ha', 'multinode'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu - os: centos - version: 2014.2-6.1 + version: 2015.1.0-7.0 mode: ['ha', 'multinode'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/centos # Version of plugin package -package_version: '2.0.0' +package_version: '3.0.0' diff --git a/volumes.yaml b/volumes.yaml new file mode 100644 index 0000000..7c022d0 --- /dev/null +++ b/volumes.yaml @@ -0,0 +1,7 @@ +volumes_roles_mapping: + # Default role mapping + cinder_netapp: + - {allocate_size: "min", id: "os"} + +# Set here new volumes for your role +volumes: []