Skip to content

Commit

Permalink
HTTP 500 API Error Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
taiojia committed Jul 28, 2015
1 parent fb914e1 commit 8d95665
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion roles/cinder_api/templates/cinder.conf-2.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ my_ip = {{ controller02_mgmt_ip }}
glance_host = {{ glance_host }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/cinder_api/templates/cinder.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ my_ip = {{ controller01_mgmt_ip }}
glance_host = {{ glance_host }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/cinder_controller/templates/cinder.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rabbit_password = {{ rabbitmq_guest_password }}
my_ip = {{ controller1_management_network_ip }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/cinder_storage/templates/cinder.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ my_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
glance_host = {{ glance_host }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/cinder_volume_ceph/templates/cinder.conf-2.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ my_ip = {{ controller02_mgmt_ip }}
glance_host = {{ glance_host }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/cinder_volume_ceph/templates/cinder.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ my_ip = {{ controller01_mgmt_ip }}
glance_host = {{ glance_host }}

[database]
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_MGMT }}/cinder
connection = mysql://cinder:{{ cinder_db_password }}@{{ VIP_DB }}/cinder

[keystone_authtoken]
auth_uri = http://{{ VIP_MGMT }}:5000/v2.0
Expand Down
2 changes: 1 addition & 1 deletion roles/compute_controller/templates/nova.conf-2.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ network_api_class = nova.network.api.API
security_group_api = nova

[database]
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_MGMT }}/nova
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_DB }}/nova

[keystone_authtoken]
auth_uri = {{ auth_uri }}
Expand Down
2 changes: 1 addition & 1 deletion roles/compute_controller/templates/nova.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ network_api_class = nova.network.api.API
security_group_api = nova

[database]
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_MGMT }}/nova
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_DB }}/nova

[keystone_authtoken]
auth_uri = {{ auth_uri }}
Expand Down
4 changes: 2 additions & 2 deletions roles/glance/templates/glance-api.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ backend = sqlalchemy
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
connection = mysql://glance:{{ glance_db_password }}@{{ VIP_MGMT }}/glance
connection = mysql://glance:{{ glance_db_password }}@{{ VIP_DB }}/glance

# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
Expand Down Expand Up @@ -699,4 +699,4 @@ sheepdog_store_chunk_size = 64
#vmware_store_image_dir = /openstack_glance

# Allow to perform insecure SSL requests to the target system (boolean value)
#vmware_api_insecure = False
#vmware_api_insecure = False
4 changes: 2 additions & 2 deletions roles/glance/templates/glance-registry.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ backend = sqlalchemy
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
connection = mysql://glance:{{ openstack_glance_pass }}@{{ VIP_MGMT }}/glance
connection = mysql://glance:{{ openstack_glance_pass }}@{{ VIP_DB }}/glance

# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
Expand Down Expand Up @@ -244,4 +244,4 @@ flavor = keystone
#enabled = False

# If False doesn't trace SQL requests.
#trace_sqlalchemy = False
#trace_sqlalchemy = False
2 changes: 1 addition & 1 deletion roles/heat_controller/templates/heat.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ log_dir=/var/log/heat
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection=<None>
connection = mysql://heat:{{ heat_db_password }}@{{ VIP_MGMT }}/heat
connection = mysql://heat:{{ heat_db_password }}@{{ VIP_DB }}/heat

# The SQLAlchemy connection string to use to connect to the
# slave database. (string value)
Expand Down
2 changes: 1 addition & 1 deletion roles/nova_network_controller/templates/nova.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ network_api_class = nova.network.api.API
security_group_api = nova

[database]
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_MGMT }}/nova
connection = mysql://nova:{{ nova_db_password }}@{{ VIP_DB }}/nova

[keystone_authtoken]
auth_uri = {{ auth_uri }}
Expand Down
4 changes: 2 additions & 2 deletions roles/switch_glance_file/templates/glance-api.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ backend = sqlalchemy
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
connection = mysql://glance:{{ glance_db_password }}@{{ controller1_management_network_ip }}/glance
connection = mysql://glance:{{ glance_db_password }}@{{ VIP_DB }}/glance

# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
Expand Down Expand Up @@ -696,4 +696,4 @@ sheepdog_store_chunk_size = 64
#vmware_store_image_dir = /openstack_glance

# Allow to perform insecure SSL requests to the target system (boolean value)
#vmware_api_insecure = False
#vmware_api_insecure = False
4 changes: 2 additions & 2 deletions roles/switch_glance_swift/templates/glance-api.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ backend = sqlalchemy
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
connection = mysql://glance:{{ glance_db_password }}@{{ controller1_management_network_ip }}/glance
connection = mysql://glance:{{ glance_db_password }}@{{ VIP_DB }}/glance

# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
Expand Down Expand Up @@ -697,4 +697,4 @@ sheepdog_store_chunk_size = 64
#vmware_store_image_dir = /openstack_glance

# Allow to perform insecure SSL requests to the target system (boolean value)
#vmware_api_insecure = False
#vmware_api_insecure = False
1 change: 1 addition & 0 deletions vars/openstack/openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ flat_interface: eth2
# Management network VIP and storage network VIP
VIP_MGMT: 10.32.151.3
VIP_STORAGE: 192.168.1.3
VIP_DB: 127.0.0.1

# Both of mariadb ips for HAProxy
wsrep_cluster_address: 10.32.151.19,10.32.151.17
Expand Down

0 comments on commit 8d95665

Please sign in to comment.