From 4aefd918fb06bb7e0f24ea8118b8e64ff3a9a95e Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Thu, 4 Feb 2016 13:25:19 +0100 Subject: [PATCH] Switch from mysql-python to pymysql everywhere Change-Id: Icb603d77c4421092a0e6b45b724b30788ea72a52 Closes-Bug: 1541816 --- config/cinder/templates/cinder.conf.j2 | 2 +- config/glance/templates/glance-api.conf.j2 | 2 +- config/glance/templates/glance-registry.conf.j2 | 2 +- config/keystone/templates/keystone.conf.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cinder/templates/cinder.conf.j2 b/config/cinder/templates/cinder.conf.j2 index ba03dd43..92b28c14 100644 --- a/config/cinder/templates/cinder.conf.j2 +++ b/config/cinder/templates/cinder.conf.j2 @@ -20,7 +20,7 @@ nova_catalog_info = compute:nova:internalURL auth_strategy = keystone [database] -connection = mysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }} +connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_password }}@{{ cinder_database_address }}/{{ cinder_database_name }} [keystone_authtoken] auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} diff --git a/config/glance/templates/glance-api.conf.j2 b/config/glance/templates/glance-api.conf.j2 index 19f35d8a..e8b111a5 100644 --- a/config/glance/templates/glance-api.conf.j2 +++ b/config/glance/templates/glance-api.conf.j2 @@ -10,7 +10,7 @@ bind_port = {{ glance_api_port }} registry_host = {{ kolla_internal_address }} [database] -connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} +connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} [keystone_authtoken] auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} diff --git a/config/glance/templates/glance-registry.conf.j2 b/config/glance/templates/glance-registry.conf.j2 index f9a4b5e7..be2f5667 100644 --- a/config/glance/templates/glance-registry.conf.j2 +++ b/config/glance/templates/glance-registry.conf.j2 @@ -8,7 +8,7 @@ bind_port = {{ glance_registry_port }} [database] -connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} +connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} [keystone_authtoken] auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} diff --git a/config/keystone/templates/keystone.conf.j2 b/config/keystone/templates/keystone.conf.j2 index d93b92ad..26955a1f 100644 --- a/config/keystone/templates/keystone.conf.j2 +++ b/config/keystone/templates/keystone.conf.j2 @@ -6,4 +6,4 @@ use_stderr = {{ openstack_use_stderr }} admin_token = {{ keystone_admin_token }} [database] -connection = mysql://{{ keystone_database_user }}:{{ keystone_database_password }}@{{ keystone_database_address }}/{{ keystone_database_name }} +connection = mysql+pymysql://{{ keystone_database_user }}:{{ keystone_database_password }}@{{ keystone_database_address }}/{{ keystone_database_name }}