Upgrade OpenStack version from Pike to Queens

Change-Id: Ice7b3204ade23571df41fc4effb91bb5e125abac
Signed-off-by: Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com>

23 files changed, 24 insertions, 24 deletions

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 5178964c..f62f9ba0 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -8,9 +8,9 @@ else
     export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*17.*'}
 fi
 
-# pike
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"pike"}
 export DEPLOY_TOOL=${DEPLOY_TOOL:-"osa"}
+# queens
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"queens"}
 
 # don't touch this
 export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml
index 77160d69..a5b01145 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_dpdk.yml b/deploy/conf/hardware_environment/huawei-pod1/network_dpdk.yml
index 03483629..3e871f98 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network_dpdk.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network.yml b/deploy/conf/hardware_environment/huawei-pod2/network.yml
index ccf66a47..9e6365ee 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_dpdk.yml b/deploy/conf/hardware_environment/huawei-pod2/network_dpdk.yml
index b357a6e1..40124467 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_dpdk.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod8/network.yml b/deploy/conf/hardware_environment/huawei-pod8/network.yml
index 6a75f34d..d6b89d2b 100644
--- a/deploy/conf/hardware_environment/huawei-pod8/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod8/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/intel-pod17/network.yml b/deploy/conf/hardware_environment/intel-pod17/network.yml
index bb6f5130..a524c52d 100644
--- a/deploy/conf/hardware_environment/intel-pod17/network.yml
+++ b/deploy/conf/hardware_environment/intel-pod17/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml b/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml
index 7cc421e7..4b35483b 100644
--- a/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml
+++ b/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/network_cfg_dpdk.yaml b/deploy/conf/network_cfg_dpdk.yaml
index e196d6f4..def5d308 100644
--- a/deploy/conf/network_cfg_dpdk.yaml
+++ b/deploy/conf/network_cfg_dpdk.yaml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/network_cfg_sriov.yaml b/deploy/conf/network_cfg_sriov.yaml
index fcde4c95..cb4d9b7f 100644
--- a/deploy/conf/network_cfg_sriov.yaml
+++ b/deploy/conf/network_cfg_sriov.yaml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual1/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual2/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network.yml b/deploy/conf/vm_environment/huawei-virtual4/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual8/network.yml b/deploy/conf/vm_environment/huawei-virtual8/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual8/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual8/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual9/network.yml b/deploy/conf/vm_environment/huawei-virtual9/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/huawei-virtual9/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual9/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml
index e196d6f4..def5d308 100644
--- a/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml
+++ b/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller
diff --git a/deploy/conf/vm_environment/network.yml b/deploy/conf/vm_environment/network.yml
index 4359202e..420b478a 100644
--- a/deploy/conf/vm_environment/network.yml
+++ b/deploy/conf/vm_environment/network.yml
@@ -14,7 +14,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-provider
     network: physnet
-    interface: eth10
+    interface: eth1
     type: ovs
     role:
       - controller