From 25195b1302c7c99229f5e309439d5848739912e6 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 20 May 2015 01:04:01 +0000
Subject: [PATCH] Switch from MySQL-python to PyMySQL

As discussed in the Liberty Design Summit "Moving apps to Python 3"
cross-project workshop, the way forward in the near future is to
switch to the pure-python PyMySQL library as a default.

https://etherpad.openstack.org/p/liberty-cross-project-python3

Change-Id: I5d2a9ec4cd52b81b715003e58e593f8395e66959
---
 test-requirements.txt                 |  2 +-
 tuskar/api/templates/compute.yaml     |  4 ++--
 tuskar/api/templates/not_compute.yaml | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index c95f5ba4..29b6fc39 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,4 +17,4 @@ testrepository>=0.0.18
 testtools>=0.9.36,!=1.2.0
 unittest2
 psycopg2
-MySQL-python
+PyMySQL>=0.6.2  # MIT License
diff --git a/tuskar/api/templates/compute.yaml b/tuskar/api/templates/compute.yaml
index 8c52f8ec..53e21447 100644
--- a/tuskar/api/templates/compute.yaml
+++ b/tuskar/api/templates/compute.yaml
@@ -45,7 +45,7 @@
         ovs_db:
           Fn::Join:
           - ''
-          - - mysql://neutron:unset@
+          - - mysql+pymysql://neutron:unset@
             - Fn::GetAtt:
               - notcompute
               - PrivateIp
@@ -56,7 +56,7 @@
         db:
           Fn::Join:
           - ''
-          - - mysql://nova:unset@
+          - - mysql+pymysql://nova:unset@
             - Fn::GetAtt:
               - notcompute
               - PrivateIp
diff --git a/tuskar/api/templates/not_compute.yaml b/tuskar/api/templates/not_compute.yaml
index a972afd5..dcff486d 100644
--- a/tuskar/api/templates/not_compute.yaml
+++ b/tuskar/api/templates/not_compute.yaml
@@ -31,12 +31,12 @@
       admin-password: unset
       admin-token: unset
       cinder:
-        db: mysql://cinder:unset@localhost/cinder
+        db: mysql+pymysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
       controller-address: 192.0.2.5
       db-password: unset
       glance:
-        db: mysql://glance:unset@localhost/glance
+        db: mysql+pymysql://glance:unset@localhost/glance
         host: 192.0.2.5
       heat:
         access_key_id:
@@ -45,7 +45,7 @@
         admin_tenant_name: service
         admin_user: heat
         auth_encryption_key: unset___________
-        db: mysql://heat:unset@localhost/heat
+        db: mysql+pymysql://heat:unset@localhost/heat
         heat_watch_server_url: http://192.0.2.5:8003
         metadata_server_url: http://192.0.2.5:8000
         refresh:
@@ -63,7 +63,7 @@
       interfaces:
         control: eth2
       keystone:
-        db: mysql://keystone:unset@localhost/keystone
+        db: mysql+pymysql://keystone:unset@localhost/keystone
         host: 192.0.2.5
       neutron:
         floatingip_end: 192.0.2.64
@@ -80,10 +80,10 @@
           ovs_range: 10.0.0.0/8
           public_interface: eth0
           tenant_network_type: gre
-        ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
+        ovs_db: mysql+pymysql://neutron:unset@localhost/ovs_neutron?charset=utf8
       nova:
         compute_driver: libvirt.LibvirtDriver
-        db: mysql://nova:unset@localhost/nova
+        db: mysql+pymysql://nova:unset@localhost/nova
         host: 192.0.2.5
         metadata-proxy: true
       rabbit: