Fixed some issues in the container lists in the Makefile and in
containers.cfg. An obscure KVM bug was not digesting host-model
properly on some architectures causing a kernal panic on boot.
In order to work around that bug, host-passthrough will be used
until KVM is fixed in ubuntu16.04. This bug doesn't exist in
ubuntu14.
Change-Id: I7b99bd249ca3222d47cbc6a642177f7e6390049a
diff --git a/Makefile b/Makefile
index eb970c6..02e386e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd tools
# This should to be the first and default target in this Makefile
help:
@@ -99,7 +99,7 @@
jenkins-containers: docker-base voltha chameleon ofagent netconf consul registrator
-prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul registrator golang envoyd envoy fluentd
+prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul tools golang envoyd envoy fluentd
containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy fluentd
diff --git a/Vagrantfile b/Vagrantfile
index 7ae899c..7806a05 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -51,6 +51,10 @@
d.vm.provider Provider do |v|
v.memory = 6144
v.cpus = 4
+ if settings['vProvider'] == "KVM"
+ v.cpu_mode = 'host-passthrough'
+ v.cpu_fallback = 'allow'
+ end
end
end
diff --git a/install/Vagrantfile b/install/Vagrantfile
index 54b6f12..bd98bfa 100644
--- a/install/Vagrantfile
+++ b/install/Vagrantfile
@@ -18,6 +18,10 @@
d.vm.provider "libvirt" do |v|
v.memory = 6144
v.cpus = 2
+ if settings['vProvider'] == "KVM"
+ v.cpu_mode = 'host-passthrough'
+ v.cpu_fallback = 'allow'
+ end
end
end
end
diff --git a/install/ansible/roles/common/defaults/main.yml b/install/ansible/roles/common/defaults/main.yml
index 7be66d2..43637ae 100644
--- a/install/ansible/roles/common/defaults/main.yml
+++ b/install/ansible/roles/common/defaults/main.yml
@@ -17,6 +17,7 @@
- python-nose
- python-flake8
- python-scapy
+# - glusterfs-server
# - python-libpcap
obsolete_services:
diff --git a/install/containers.cfg b/install/containers.cfg
index a097e12..be0409e 100644
--- a/install/containers.cfg
+++ b/install/containers.cfg
@@ -16,3 +16,4 @@
- voltha/envoy:latest
- registry:2
- cord/fluentd
+ - voltha/tools
diff --git a/install/vmTemplate.xml b/install/vmTemplate.xml
index 0c2d521..a2d7e6d 100644
--- a/install/vmTemplate.xml
+++ b/install/vmTemplate.xml
@@ -11,7 +11,7 @@
<acpi/>
<apic/>
</features>
- <cpu mode='host-model'>
+ <cpu mode='host-passthrough'>
<model fallback='allow'/>
</cpu>
<clock offset='utc'>