Merge "KVM scenario updates"

diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
index 4781466..0106213 100644 (file)
--- 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/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
index 31606a7..a8c6067 100644 (file)
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-OVS_NSH_DPDK_BRANCH?=a58fe672a839372a576d204ec38aa0d20e28b9ed
+OVS_NSH_DPDK_BRANCH?=19d383d5e97cca390c314b64ce93dc01b9e8dc23
 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
 OVS_NSH_DPDK_CHANGE?=

diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index 576018d..35f4059 100644 (file)
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-VSPERF_BRANCH?=5e3b6ae0427963520357453728411327ac8efafe
+VSPERF_BRANCH?=5a0c6772d255aeb0ab1e6246c91bbeb56bb3a239
 VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
 VSPERF_CHANGE?=

diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index afe5daf..985a292 100644 (file)
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
 interfaces_1:
   ens3:
   - fuelweb_admin
-  - management
-  ens4:
   - storage
+  ens4:
+  - management
   ens5:
   - private
   ens6:
@@ -51,10 +51,10 @@ transformations_1:
     name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: ens3.101
+    name: ens4
   - action: add-port
     bridge: br-storage
-    name: ens4.102
+    name: ens3.102
   - action: add-port
     bridge: br-mesh
     name: ens5.103
@@ -119,22 +119,22 @@ network:
     gateway: null
     ip_ranges:
     - - 192.168.0.1
-      - 192.168.0.254
+      - 192.168.0.253
     meta:
       cidr: 192.168.0.0/24
       configurable: true
       map_priority: 2
       name: management
-      notation: cidr
+      notation: ip_ranges
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: null
     name: management
-    vlan_start: 101
+    vlan_start: null
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:

diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index 6405db6..ce3b62a 100644 (file)
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
 interfaces_1:
   ens3:
   - fuelweb_admin
-  - management
-  ens4:
   - storage
+  ens4:
+  - management
   ens5:
   - private
   ens6:
@@ -51,10 +51,10 @@ transformations_1:
     name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: ens3.101
+    name: ens4
   - action: add-port
     bridge: br-storage
-    name: ens4.102
+    name: ens3.102
   - action: add-port
     bridge: br-mesh
     name: ens5.103
@@ -118,22 +118,22 @@ network:
     gateway: null
     ip_ranges:
     - - 192.168.0.1
-      - 192.168.0.254
+      - 192.168.0.253
     meta:
       cidr: 192.168.0.0/24
       configurable: true
       map_priority: 2
       name: management
-      notation: cidr
+      notation: ip_ranges
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: null
     name: management
-    vlan_start: 101
+    vlan_start: null
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:

diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index c5b94a5..736e9af 100644 (file)
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
 interfaces_1:
   ens3:
   - fuelweb_admin
-  - management
-  ens4:
   - storage
+  ens4:
+  - management
   ens5:
   - private
   ens6:
@@ -51,10 +51,10 @@ transformations_1:
     name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: ens3.101
+    name: ens4
   - action: add-port
     bridge: br-storage
-    name: ens4.102
+    name: ens3.102
   - action: add-port
     bridge: br-mesh
     name: ens5.103
@@ -118,22 +118,22 @@ network:
     gateway: null
     ip_ranges:
     - - 192.168.0.1
-      - 192.168.0.254
+      - 192.168.0.253
     meta:
       cidr: 192.168.0.0/24
       configurable: true
       map_priority: 2
       name: management
-      notation: cidr
+      notation: ip_ranges
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: null
     name: management
-    vlan_start: 101
+    vlan_start: null
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:

diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index c599575..ee2a0d5 100644 (file)
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@ -143,22 +143,24 @@ def merge_dicts(dict1, dict2):
         if k in dict1 and k in dict2:
             if isinstance(dict1[k], dict) and isinstance(dict2[k], dict):
                 yield (k, dict(merge_dicts(dict1[k], dict2[k])))
-            elif isinstance(dict1[k], list) and isinstance(dict2[k], list):
+                continue
+            if isinstance(dict1[k], list) and isinstance(dict2[k], list):
                 if k == 'versions':
                     yield (k,
                            merge_fuel_plugin_version_list(dict1[k], dict2[k]))
+                    continue
                 if k == 'networks':
                     yield (k,
                            merge_networks(dict1[k], dict2[k]))
-            else:
-                # If one of the values is not a dict nor a list,
-                # you can't continue merging it.
-                # Value from second dict overrides one in first and we move on.
-                yield (k, dict2[k])
-        elif k in dict1:
-            yield (k, dict1[k])
-        else:
+                    continue
+
+            # If one of the values is not a dict nor a list,
+            # you can't continue merging it.
+            # Value from second dict overrides one in first if exists.
+        if k in dict2:
             yield (k, dict2[k])
+        else:
+            yield (k, dict1[k])
 
 
 setup_yaml()

diff --git a/deploy/templates/virtual_environment/networks/fuel2.xml b/deploy/templates/virtual_environment/networks/fuel2.xml
index 615c920..5587886 100644 (file)
--- a/deploy/templates/virtual_environment/networks/fuel2.xml
+++ b/deploy/templates/virtual_environment/networks/fuel2.xml
@@ -1,5 +1,6 @@
 <network>
   <name>fuel2</name>
   <bridge name='fuel2' stp='on' delay='0'/>
+  <ip address='192.168.0.254' netmask='255.255.255.0'/>
 </network>
 

diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml
index 95db879..0bff888 100644 (file)
--- a/deploy/templates/virtual_environment/vms/compute.xml
+++ b/deploy/templates/virtual_environment/vms/compute.xml
@@ -14,6 +14,9 @@
     <apic/>
     <pae/>
   </features>
+  <cpu mode='host-model'>
+    <model fallback='allow'/>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>

diff --git a/prototypes/sfc_tacker/poc.tacker-up.sh b/prototypes/sfc_tacker/poc.tacker-up.sh
index e22eeac..fc45c76 100755 (executable)
--- 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
 }