From bf94308fd5ba1414ce3e68badd336df64cf2d267 Mon Sep 17 00:00:00 2001 From: Francesco Santoro Date: Fri, 30 Sep 2016 13:53:38 +0200 Subject: [PATCH] 6wind-virtual-accelerator-plugin: postpone 6wind extension installation This patch postpones 6wind-openstack-extension in the post deployment phase to make sure that nova compute is already installed. This scenario should not happen but let's make sure. Signed-off-by: Francesco Santoro Change-Id: I92bea776cc0aa354aede88ef00316b8762841b83 --- .../puppet/modules/virtual_accelerator/manifests/install.pp | 4 ---- .../puppet/modules/virtual_accelerator/manifests/service.pp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/install.pp b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/install.pp index 7efa949..8ac76b3 100644 --- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/install.pp +++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/install.pp @@ -32,10 +32,6 @@ class virtual_accelerator::install inherits virtual_accelerator { } -> package { 'crudini': ensure => 'installed', - } -> - package { "6wind-openstack-extensions": - ensure => 'installed', - install_options => ['--allow-unauthenticated'], } } diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp index b863169..0395cfb 100644 --- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp +++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp @@ -13,6 +13,11 @@ class virtual_accelerator::service inherits virtual_accelerator { } } + package { "6wind-openstack-extensions": + ensure => 'installed', + install_options => ['--allow-unauthenticated'], + } + exec { 'vcpu_pin': command => "crudini --set ${NOVA_CONF_FILE} DEFAULT vcpu_pin_set $(python /usr/local/bin/get_vcpu_pin_set.py)", notify => Service['virtual-accelerator'],