x/tuskar
Code Issues Proposed changes

Merge "Switch from MySQL-python to PyMySQL"

Browse Source
This commit is contained in:
Jenkins 2015-09-21 20:44:21 +00:00 committed by Gerrit Code Review
commit 40b2de1531
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -17,4 +17,4 @@ testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0 testtools>=0.9.36,!=1.2.0
unittest2 unittest2
psycopg2 psycopg2
MySQL-python PyMySQL>=0.6.2 # MIT License

4
tuskar/api/templates/compute.yaml
View File

@ -45,7 +45,7 @@
ovs_db: ovs_db:
Fn::Join: Fn::Join:
- '' - ''
- - mysql://neutron:unset@ - - mysql+pymysql://neutron:unset@
- Fn::GetAtt: - Fn::GetAtt:
- notcompute - notcompute
- PrivateIp - PrivateIp
@ -56,7 +56,7 @@
db: db:
Fn::Join: Fn::Join:
- '' - ''
- - mysql://nova:unset@ - - mysql+pymysql://nova:unset@
- Fn::GetAtt: - Fn::GetAtt:
- notcompute - notcompute
- PrivateIp - PrivateIp

12
tuskar/api/templates/not_compute.yaml
View File

@ -31,12 +31,12 @@
admin-password: unset admin-password: unset
admin-token: unset admin-token: unset
cinder: cinder:
db: mysql://cinder:unset@localhost/cinder db: mysql+pymysql://cinder:unset@localhost/cinder
volume_size_mb: '5000' volume_size_mb: '5000'
controller-address: 192.0.2.5 controller-address: 192.0.2.5
db-password: unset db-password: unset
glance: glance:
db: mysql://glance:unset@localhost/glance db: mysql+pymysql://glance:unset@localhost/glance
host: 192.0.2.5 host: 192.0.2.5
heat: heat:
access_key_id: access_key_id:
@ -45,7 +45,7 @@
admin_tenant_name: service admin_tenant_name: service
admin_user: heat admin_user: heat
auth_encryption_key: unset___________ 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 heat_watch_server_url: http://192.0.2.5:8003
metadata_server_url: http://192.0.2.5:8000 metadata_server_url: http://192.0.2.5:8000
refresh: refresh:
@ -63,7 +63,7 @@
interfaces: interfaces:
control: eth2 control: eth2
keystone: keystone:
db: mysql://keystone:unset@localhost/keystone db: mysql+pymysql://keystone:unset@localhost/keystone
host: 192.0.2.5 host: 192.0.2.5
neutron: neutron:
floatingip_end: 192.0.2.64 floatingip_end: 192.0.2.64
@ -80,10 +80,10 @@
ovs_range: 10.0.0.0/8 ovs_range: 10.0.0.0/8
public_interface: eth0 public_interface: eth0
tenant_network_type: gre 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: nova:
compute_driver: libvirt.LibvirtDriver compute_driver: libvirt.LibvirtDriver
db: mysql://nova:unset@localhost/nova db: mysql+pymysql://nova:unset@localhost/nova
host: 192.0.2.5 host: 192.0.2.5
metadata-proxy: true metadata-proxy: true
rabbit: rabbit: