openstack/openstack-ansible-os_cloudkitty
Code Issues Proposed changes

final changes needed to get kitty working

Browse Source 
Kitty cli client and horizon dashboard were not
working. The endpoints had a v1 and tenant in them
which was not working correctly. This change removed
the v1 and tenant bits from the end point which fixed
the UI and CLI.

Implements: blueprint role-cloudkitty
This commit is contained in:
Michael Rice
2016-05-18 20:27:56 +00:00
committed by Michael Rice
parent 525574f788
commit 52e56cc298
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@@ -72,11 +72,11 @@ cloudkitty_service_adminuri_proto: "{{ openstack_service_adminuri_proto | defaul
cloudkitty_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(cloudkitty_service_proto) }}" cloudkitty_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(cloudkitty_service_proto) }}"
cloudkitty_service_type: orchestration cloudkitty_service_type: orchestration
cloudkitty_service_publicuri: "{{ cloudkitty_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cloudkitty_service_port }}" cloudkitty_service_publicuri: "{{ cloudkitty_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cloudkitty_service_port }}"
cloudkitty_service_publicurl: "{{ cloudkitty_service_publicuri }}/v1/%(tenant_id)s" cloudkitty_service_publicurl: "{{ cloudkitty_service_publicuri }}/"
cloudkitty_service_adminuri: "{{ cloudkitty_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cloudkitty_service_port }}" cloudkitty_service_adminuri: "{{ cloudkitty_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cloudkitty_service_port }}"
cloudkitty_service_adminurl: "{{ cloudkitty_service_adminuri }}/v1/%(tenant_id)s" cloudkitty_service_adminurl: "{{ cloudkitty_service_adminuri }}/"
cloudkitty_service_internaluri: "{{ cloudkitty_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cloudkitty_service_port }}" cloudkitty_service_internaluri: "{{ cloudkitty_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ cloudkitty_service_port }}"
cloudkitty_service_internalurl: "{{ cloudkitty_service_internaluri }}/v1/%(tenant_id)s" cloudkitty_service_internalurl: "{{ cloudkitty_service_internaluri }}/"
cloudkitty_service_program_name: cloudkitty-api cloudkitty_service_program_name: cloudkitty-api
cloudkitty_service_processor_program_name: cloudkitty-processor cloudkitty_service_processor_program_name: cloudkitty-processor

4
tasks/cloudkitty_domain_setup.yml
View File

@@ -88,7 +88,7 @@
- name: Ensure cloudkitty service - name: Ensure cloudkitty service
keystone: keystone:
command: "ensure_service" command: "ensure_service"
service_name: "CloudKitty" service_name: "cloudkitty"
service_type: "rating" service_type: "rating"
login_user: "{{ keystone_admin_user_name }}" login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}" login_password: "{{ keystone_auth_admin_password }}"
@@ -104,7 +104,7 @@
- name: Ensure cloudkitty endpoints - name: Ensure cloudkitty endpoints
keystone: keystone:
command: "ensure_endpoint" command: "ensure_endpoint"
service_name: "CloudKitty" service_name: "cloudkitty"
service_type: "rating" service_type: "rating"
region_name: "{{ service_region }}" region_name: "{{ service_region }}"
endpoint_list: endpoint_list: