summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-11-06 10:57:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-06 10:57:28 +0000
commitaa31e99c06c7c003ed5339ada7b962689d16c030 (patch)
treeaeb2d23232f59ebcb564753e6fb18a13373c1ce0
parent170d2d1c195d001d6ca786364aaf3c10e714ae36 (diff)
parentaa0ccb8daea30e290cf5824e639ddd153f2da3fe (diff)
Merge "[opendaylight] Update SQLAlchemy library"
-rw-r--r--mcp/config/scenario/os-odl-bgpvpn-noha.yaml1
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml1
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml1
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml1
-rw-r--r--mcp/config/scenario/os-odl-sfc-noha.yaml1
-rwxr-xr-xmcp/config/states/sqlalchemy_update16
6 files changed, 21 insertions, 0 deletions
diff --git a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
index 1b2e2d0fb..d49fcf677 100644
--- 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 51d476de5..61a28891d 100644
--- 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 3133d0e62..b43f790ce 100644
--- 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 e2df6a476..02f652bee 100644
--- 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 8611b0261..88ad1037b 100644
--- 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
index 000000000..d4901a9c5
--- /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