From 6132c0eb7f5f578f2f1d5e8d9003968494587249 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 9 Oct 2015 17:25:10 +0100 Subject: [PATCH] Switch from MySQL-python to PyMySQL As part of the cross-project effort [1] to prepare OpenStack for Python3 as the primary Python version used, the decision has been made to switch from using MySQL-python to PyMySQL [2]. This patch switches all OpenStack Services to use the PyMySQL library. [1] https://etherpad.openstack.org/p/liberty-cross-project-python3 [2] https://review.openstack.org/184388 UpgradeImpact Implements: blueprint liberty-release Change-Id: I7532b5dd72cd2f682f1e4ffdf290b741c2185cb3 --- defaults/main.yml | 2 +- templates/glance-api.conf.j2 | 2 +- templates/glance-manage.conf.j2 | 2 +- templates/glance-registry.conf.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2645d445..5bba92ec 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -158,7 +158,7 @@ glance_apt_packages: glance_pip_packages: - glance - keystonemiddleware - - MySQL-python + - PyMySQL - python-memcached - pycrypto - python-glanceclient diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index adfd70da..4e15443b 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -50,7 +50,7 @@ show_image_direct_url = {{ glance_show_image_direct_url }} task_executor = {{ glance_task_executor }} [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 [keystone_authtoken] insecure = {{ keystone_service_internaluri_insecure | bool }} diff --git a/templates/glance-manage.conf.j2 b/templates/glance-manage.conf.j2 index 069a6e26..453e7e71 100644 --- a/templates/glance-manage.conf.j2 +++ b/templates/glance-manage.conf.j2 @@ -5,4 +5,4 @@ log_file = /var/log/glance/glance-manage.log fatal_deprecations = {{ glance_fatal_deprecations }} [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index ac26de24..4c60a4ad 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -21,7 +21,7 @@ rpc_backend = {{ glance_rpc_backend }} {% endif %} [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 [keystone_authtoken] insecure = {{ keystone_service_internaluri_insecure | bool }}