diff --git a/defaults/main.yml b/defaults/main.yml index 2a5ba1f..9a148a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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_type: orchestration 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_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_internalurl: "{{ cloudkitty_service_internaluri }}/v1/%(tenant_id)s" +cloudkitty_service_internalurl: "{{ cloudkitty_service_internaluri }}/" cloudkitty_service_program_name: cloudkitty-api cloudkitty_service_processor_program_name: cloudkitty-processor diff --git a/tasks/cloudkitty_domain_setup.yml b/tasks/cloudkitty_domain_setup.yml index 32de179..11570cd 100644 --- a/tasks/cloudkitty_domain_setup.yml +++ b/tasks/cloudkitty_domain_setup.yml @@ -88,7 +88,7 @@ - name: Ensure cloudkitty service keystone: command: "ensure_service" - service_name: "CloudKitty" + service_name: "cloudkitty" service_type: "rating" login_user: "{{ keystone_admin_user_name }}" login_password: "{{ keystone_auth_admin_password }}" @@ -104,7 +104,7 @@ - name: Ensure cloudkitty endpoints keystone: command: "ensure_endpoint" - service_name: "CloudKitty" + service_name: "cloudkitty" service_type: "rating" region_name: "{{ service_region }}" endpoint_list:

AltStyle によって変換されたページ (->オリジナル) /