From 19e095b226d11a13aacc19e40aba44d6385f46af Mon Sep 17 00:00:00 2001
From: Serhii Lystopad <slystopad@mirantis.com>
Date: Wed, 27 Apr 2016 08:26:34 +0000
Subject: [PATCH] Inject deployment task into graph for compute role

Inject deployment task into graph for compute role instead of being
run on post-deployment step (compatibility mode for packages 2.0.0)

Change-Id: I670fc86e56cf3cfaf723802e3686de1cdadda67f
---
 README.md             | 13 +++++++++----
 deployment_tasks.yaml |  9 +++++++++
 metadata.yaml         | 13 +++++++++----
 tasks.yaml            |  8 --------
 4 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 deployment_tasks.yaml
 delete mode 100644 tasks.yaml

diff --git a/README.md b/README.md
index 4521dfd..8a6affc 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ Nova-nfs plugin
 Overview
 --------
 nova-nfs uses nfs backend to store ephemeral volumes (intances.) This plugin allow to mount a nfs volume
-annd use it as storage backend for Nova.
+and use it as storage backend for Nova. It introduce deployment task which will be rinning on ``compute``
+role
 
 This repo contains all necessary files to build nova-nfs Fuel plugin.
 
@@ -16,7 +17,7 @@ Requirements
 
 | Requirement                      | Version/Comment                                         |
 |----------------------------------|---------------------------------------------------------|
-| Mirantis Openstack compatibility | 7.0                                                     |
+| Mirantis Openstack compatibility | 7.0, 8.0                                                |
 |----------------------------------|---------------------------------------------------------|
 | NFS Server                       | an NFS server with volume accessible from compute nodes |
 
@@ -28,7 +29,7 @@ None.
 Limitations
 -----------
 
-Only on nfs volume can be defined. So in HA deployment compute node will share the same
+Only one nfs volume can be defined. So in HA deployment compute node will share the same
 storage backend for instances.
 
 Installation Guide
@@ -90,7 +91,7 @@ Deployment details
 ------------------
 
 Create mountpoint directory
-Edit Fstab to add auto mount of NFS volume on the mountpoint
+Edit ``/etc/fstab`` to add auto mount of NFS volume on the mountpoint
 Configure Nova to use it as backend for instances
 Restart nova services
 
@@ -113,3 +114,7 @@ Release Notes
 **3.0.0**
 
 * Update plugin to Fuel 7.0 release
+
+**3.2.0**
+
+* Update plugin to inject task into deployment graph instead of being run as post-deployment task
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
new file mode 100644
index 0000000..3999e0a
--- /dev/null
+++ b/deployment_tasks.yaml
@@ -0,0 +1,9 @@
+- id: nova-nfs-deployment-puppet
+  type: puppet
+  groups: [compute]
+  required_for: [deploy_end]
+  requires: [deploy_start, top-role-compute, openstack-network-end]
+  parameters:
+    puppet_manifest: puppet/site.pp
+    puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
+    timeout: 360
diff --git a/metadata.yaml b/metadata.yaml
index e80f118..e3c19e8 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,15 +2,15 @@
 name: nova_nfs
 title: Nova NFS plugin
 # Plugin version
-version: 3.0.0
+version: 3.2.0
 # Description
 description: Enables Nova to use NFS volume as storage backend for ephemeral volumes
 # Required fuel version
-fuel_version: ['7.0']
+fuel_version: ['7.0', '8.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
-authors: ['Orange']
+authors: ['Orange', 'Mirantis']
 # A link to the plugin's page
 homepage: 'https://github.com/stackforge/fuel-plugin-nova-nfs'
 # Specify a group which your plugin implements, possible options:
@@ -23,10 +23,15 @@ releases:
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
+  - os: ubuntu
+    version: liberty-8.0
+    mode: ['ha', 'multinode']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
   - os: centos
     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/tasks.yaml b/tasks.yaml
deleted file mode 100644
index 04e745d..0000000
--- a/tasks.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# This task is required for compute nodes
-- role: ['compute']
-  stage: post_deployment/2000
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/site.pp
-    puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
-    timeout: 360
\ No newline at end of file