diff options
| -rw-r--r-- | build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk | 2 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/vms/compute.xml | 3 | ||||
| -rwxr-xr-x | prototypes/sfc_tacker/poc.tacker-up.sh | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk index 4781466dd..0106213d3 100644 --- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk +++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk @@ -8,6 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -COLLECTD_CEILOMETER_BRANCH?=efa17094249282eb0726b3d30dff190b86a97938 +COLLECTD_CEILOMETER_BRANCH?=3ddf95235ef62de5fb9a520b3aa8f120518b0077 COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/fastpathmetrics COLLECTD_CEILOMETER_CHANGE?= diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml index 95db87984..f4180d33d 100644 --- a/deploy/templates/virtual_environment/vms/compute.xml +++ b/deploy/templates/virtual_environment/vms/compute.xml @@ -2,6 +2,9 @@ <name>compute</name> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> + <cpu mode='host-model'> + <model fallback='forbid'/> + </cpu> <vcpu placement='static'>2</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/prototypes/sfc_tacker/poc.tacker-up.sh b/prototypes/sfc_tacker/poc.tacker-up.sh index e22eeac8b..fc45c7643 100755 --- a/prototypes/sfc_tacker/poc.tacker-up.sh +++ b/prototypes/sfc_tacker/poc.tacker-up.sh @@ -137,12 +137,12 @@ function blessPackage () { cd "$TMPDIR" patch -p 1 <<EOFDC diff -ruN a/DEBIAN/control b/DEBIAN/control ---- a/DEBIAN/control 2016-02-08 10:06:18.000000000 +0000 -+++ b/DEBIAN/control 2016-02-08 10:45:09.501373675 +0000 +--- a/DEBIAN/control 2016-08-09 05:13:13.000000000 -0400 ++++ b/DEBIAN/control 2016-08-09 05:32:56.761035046 -0400 @@ -4,7 +4,7 @@ Architecture: all Maintainer: OpenStack <openstack-dev@lists.openstack.org> - Installed-Size: 1575 + Installed-Size: 1565 -Depends: python (>= 2.7), python (<< 2.8), python:any (>= 2.7.1-0ubuntu2), python-pbr, python-paste, python-pastedeploy, python-routes, python-anyjson, python-babel, python-eventlet, python-greenlet, python-httplib2, python-requests, python-iso8601, python-jsonrpclib, python-jinja2, python-kombu, python-netaddr, python-sqlalchemy (>= 1.0~), python-sqlalchemy (<< 1.1), python-webob, python-heatclient, python-keystoneclient, alembic, python-six, python-stevedore, python-oslo.config, python-oslo.messaging-, python-oslo.rootwrap, python-novaclient +Depends: python (>= 2.7), python (<< 2.8), python:any (>= 2.7.1-0ubuntu2), python-pbr, python-paste, python-pastedeploy, python-routes, python-anyjson, python-babel, python-eventlet, python-greenlet, python-httplib2, python-requests, python-iso8601, python-jsonrpclib, python-jinja2, python-kombu, python-netaddr, python-sqlalchemy (>= 1.0~), python-sqlalchemy (<< 1.1), python-webob, python-heatclient, python-keystoneclient, alembic, python-six, python-stevedore, python-oslo.config, python-oslo.messaging, python-oslo.rootwrap, python-novaclient Section: python @@ -245,7 +245,6 @@ function populate_client() { scp ${SSH_OPTIONS[@]} -i "${MYDIR}/.ssh/id_rsa" ${CLIENT} ${fadm}@${anode}:${CLIENT} ssh ${SSH_OPTIONS[@]} -i "${MYDIR}/.ssh/id_rsa" ${fadm}@${anode} sudo dpkg -i ${CLIENT} ssh ${SSH_OPTIONS[@]} -i "${MYDIR}/.ssh/id_rsa" ${fadm}@${anode} rm ${CLIENT} - fi done } |