[opendaylight] Update SQLAlchemy library

To conform to the changes in networking-odl driver:
https://review.openstack.org/604755

Change-Id: I6aaefe9d6d4f26652464f82b7c7e45694387c8af
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit aa0ccb8daea30e290cf5824e639ddd153f2da3fe)

diff --git a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
index 1b2e2d0..d49fcf6 100644 (file)
--- a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
+++ b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
@@ -14,6 +14,7 @@ cluster:
     - neutron_gateway
     - quagga
     - networks
+    - sqlalchemy_update
 virtual:
   nodes:
     control:

diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml
index 51d476d..61a2889 100644 (file)
--- a/mcp/config/scenario/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml
@@ -12,6 +12,7 @@ cluster:
     - opendaylight
     - openstack_ha
     - networks
+    - sqlalchemy_update
 virtual:
   nodes:
     control:

diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index 3133d0e..b43f790 100644 (file)
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -13,6 +13,7 @@ cluster:
     - openstack_noha
     - neutron_gateway
     - networks
+    - sqlalchemy_update
 virtual:
   nodes:
     control:

diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index e2df6a4..02f652b 100644 (file)
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -14,6 +14,7 @@ cluster:
     - openstack_noha
     - neutron_gateway
     - networks
+    - sqlalchemy_update
 virtual:
   nodes:
     control:

diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml
index 8611b02..88ad103 100644 (file)
--- a/mcp/config/scenario/os-odl-sfc-noha.yaml
+++ b/mcp/config/scenario/os-odl-sfc-noha.yaml
@@ -14,6 +14,7 @@ cluster:
     - neutron_gateway
     - tacker
     - networks
+    - sqlalchemy_update
 virtual:
   nodes:
     control:

diff --git a/mcp/config/states/sqlalchemy_update b/mcp/config/states/sqlalchemy_update
new file mode 100755 (executable)
index 0000000..d4901a9
--- /dev/null
+++ b/mcp/config/states/sqlalchemy_update
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+sqlalchemy_ver=1.2.1
+
+salt -I 'neutron:server' pkg.install python-pip
+salt -I 'neutron:server' cmd.run \
+  "sudo -H -u neutron pip install --user SQLAlchemy==${sqlalchemy_ver}"
+
+salt -I 'neutron:server' service.restart neutron-server