summaryrefslogtreecommitdiffstats
path: root/fuel-plugin/deployment_tasks.yaml
diff options
context:
space:
mode:
authorYunhong Jiang <yunhong.jiang@linux.intel.com>2016-09-21 14:05:24 -0700
committerJiang, Yunhong <yunhong.jiang@intel.com>2016-09-21 21:55:57 +0000
commitbda39fb65e89813f4f9a69bfa3aecd5c03e60360 (patch)
tree9cb15489974acff1b54c29db7008b04359604699 /fuel-plugin/deployment_tasks.yaml
parent68463055b0a8d8a577fd111a94eb1c7eee1c4eef (diff)
Revert "[Fuel-plugin] Install kernel in post-deployment."colorado.1.0stable/colorado
This reverts commit a10a10b373f17dc423800e6bb8d1a8e99450090d. According to Fuel team, this patch will be included into C-2 release instead of C-1 release, so we have to revert it to the C stable branch. To revert from C stable branch requires cherry-picking from master branch, so here it is. Change-Id: I32e1148e5c1cd24e5696270f1aa328630ef42dd0 Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com> (cherry picked from commit 8647dbbe9db84d71610f42cec6ff619783d99800)
Diffstat (limited to 'fuel-plugin/deployment_tasks.yaml')
-rw-r--r--fuel-plugin/deployment_tasks.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml
index 0aee295c1..f6e31e3ee 100644
--- a/fuel-plugin/deployment_tasks.yaml
+++ b/fuel-plugin/deployment_tasks.yaml
@@ -1,10 +1,10 @@
- id: kvm_install
type: puppet
version: 2.0.0
- role: [compute]
- required_for: [post_deployment_end]
- requires: [post_deployment_start]
+ groups: [compute]
+ required_for: [firewall]
+ requires: [tools]
parameters:
puppet_manifest: puppet/manifests/kvm-install.pp
puppet_modules: puppet/modules:/etc/puppet/modules
- timeout: 1200
+ timeout: 720