summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/02-deploybundle.sh6
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/mysql.yaml4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml6
-rw-r--r--ci/default_deployment_config.yaml2
-rw-r--r--ci/genBundle.py7
5 files changed, 21 insertions, 4 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 7ac224ae..ee2cac9a 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -96,6 +96,12 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
workmutiple=0.05
fi
sed -i "s/worker_multiplier: 1.0/worker_multiplier: ${workmutiple}/g" default_deployment_config.yaml
+
+ if [ "$opnfvlab" != "default" ]; then
+ sed -i "s/cpu_pin_set: all/cpu_pin_set: 2-${max},^${max}/g" default_deployment_config.yaml
+ else
+ sed -i "s/cpu_pin_set: all/cpu_pin_set: 1/g" default_deployment_config.yaml
+ fi
fi
case "$opnfvlab" in
diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index dd455f0d..385dc0fe 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -8,8 +8,8 @@
{% endif %}
options:
{% if os.ha.mode == 'ha' %}
- innodb-buffer-pool-size: 16M
- max-connections: 200
+ innodb-buffer-pool-size: 128M
+ max-connections: 128M
{% else %}
innodb-buffer-pool-size: 1G
max-connections: 4000
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
index 88c12b0c..74a9b88b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
@@ -23,8 +23,10 @@
{% if opnfv.storage_dict.ceph is defined %}
ceph-osd-replication-count: {{ unit_ceph_qty() }}
{% endif %}
-{% if os.beta.huge_pages %}
- hugepages: "50%"
+ hugepages: "2048"
+{% endif %}
+{% if os.beta.cpu_pin %}
+ vcpu-pin-set: "{{ os.beta.cpu_pin_set }}"
{% endif %}
{% if os.lxd %}
virt-type: lxd
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index 977f23ee..2e97b863 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -27,6 +27,8 @@ os:
hacluster_ceph_radosgw: False
public_api: False
huge_pages: False
+ cpu_pin: False
+ cpu_pin_set: all
service:
congress: True
promise: True
diff --git a/ci/genBundle.py b/ci/genBundle.py
index fdc9a532..8075eeb9 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -182,12 +182,18 @@ if 'sfc' in features:
config['os']['network']['sfc'] = True
if 'dpdk' in features:
config['os']['network']['dpdk'] = True
+ config['os']['beta']['huge_pages'] = True
+ config['os']['beta']['cpu_pin'] = True
if 'bgpvpn' in features:
config['os']['network']['bgpvpn'] = True
if 'odll3' in features:
config['os']['network']['odll3'] = True
if 'dishypcon' in features:
config['os']['hyperconverged'] = False
+if 'hugepages' in features:
+ config['os']['beta']['huge_pages'] = True
+ config['os']['beta']['cpu_pin'] = True
+
# Set beta option from extra
if 'publicapi' in extra:
@@ -196,6 +202,7 @@ if 'radosgwcluster' in extra:
config['os']['beta']['hacluster_ceph_radosgw'] = True
if 'hugepages' in extra:
config['os']['beta']['huge_pages'] = True
+ config['os']['beta']['cpu_pin'] = True
if 'mitaka' in extra:
config['os']['release'] = 'mitaka'
if 'trusty' in extra: