summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/Makefile6
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/config.mk2
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml19
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml18
4 files changed, 39 insertions, 6 deletions
diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index ba2fd0be0..7268699c3 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
@@ -33,8 +33,7 @@ release:.kvmbuild
cp gitinfo_kvm-plugin.txt $(BUILD_BASE)
.kvmbuild:
- # fix me
- @sudo rm -rf kvmfornfv
+ @rm -rf kvmfornfv
../../docker/ubuntu-builder/install_docker.sh
git clone $(KVMFORNFV_REPO)
cd kvmfornfv; \
@@ -47,8 +46,7 @@ release:.kvmbuild
INCLUDE_DEPENDENCIES=true fpb --debug --build ./
@mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm .
$(REPOINFO) -r . > gitinfo_kvm-plugin.txt
- # fix me
- @sudo rm -rf kvmfornfv
+ @rm -rf kvmfornfv
@touch .kvmbuild
# Store artifact in cache straight away if caching is enabled
# (no .cacheid will be present unless this is a cached build)
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index 1bd40256c..9fb2f9283 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-KVMFORNFV_BRANCH=2aa991a490387f3910a7e1bf02de83a7efb28014
+KVMFORNFV_BRANCH=b1c117f1c8414bddbe4370414590f5f0b62ae4d1
KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
KVMFORNFV_CHANGE=
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml
index 09b5d0845..ad2f5ebde 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml
@@ -65,6 +65,16 @@ define_vms:
attribute:
type: virtio
controller:
+ vcpu:
+ value: 4
+ memory:
+ attribute_equlas:
+ unit: KiB
+ value: 10485760
+ currentMemory:
+ attribute_equlas:
+ unit: KiB
+ value: 10485760
devices:
interface:
attribute_equlas:
@@ -73,6 +83,14 @@ define_vms:
attribute:
type: e1000
compute:
+ memory:
+ attribute_equlas:
+ unit: KiB
+ value: 6291456
+ currentMemory:
+ attribute_equlas:
+ unit: KiB
+ value: 6291456
devices:
interface:
attribute_equlas:
@@ -80,4 +98,3 @@ define_vms:
model:
attribute:
type: e1000
-
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
index 47bc55009..3c246c11c 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
@@ -65,6 +65,16 @@ define_vms:
attribute:
type: virtio
controller:
+ vcpu:
+ value: 4
+ memory:
+ attribute_equlas:
+ unit: KiB
+ value: 10485760
+ currentMemory:
+ attribute_equlas:
+ unit: KiB
+ value: 10485760
devices:
interface:
attribute_equlas:
@@ -73,6 +83,14 @@ define_vms:
attribute:
type: e1000
compute:
+ memory:
+ attribute_equlas:
+ unit: KiB
+ value: 6291456
+ currentMemory:
+ attribute_equlas:
+ unit: KiB
+ value: 6291456
devices:
interface:
attribute_equlas: