diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf index db78580..c96462d 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf | |||
| @@ -680,7 +680,7 @@ os_tenant_name=%SERVICE_TENANT_NAME% | |||
| 680 | 680 | ||
| 681 | # Auth URL to use for openstack service access (string value) | 681 | # Auth URL to use for openstack service access (string value) |
| 682 | #os_auth_url=http://localhost:5000/v2.0 | 682 | #os_auth_url=http://localhost:5000/v2.0 |
| 683 | os_auth_url=http://%CONTROLLER_IP%:5000/v2.0 | 683 | os_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0 |
| 684 | 684 | ||
| 685 | # Region name to use for openstack service endpoints (string | 685 | # Region name to use for openstack service endpoints (string |
| 686 | # value) | 686 | # value) |
| @@ -713,25 +713,11 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0 | |||
| 713 | # | 713 | # |
| 714 | # Options defined in keystoneclient.middleware.auth_token | 714 | # Options defined in keystoneclient.middleware.auth_token |
| 715 | # | 715 | # |
| 716 | 716 | identity_uri=http://127.0.0.1:8081/keystone/admin/ | |
| 717 | # Prefix to prepend at the beginning of the path (string | 717 | # Prefix to prepend at the beginning of the path (string |
| 718 | # value) | 718 | # value) |
| 719 | #auth_admin_prefix= | 719 | #auth_admin_prefix= |
| 720 | 720 | ||
| 721 | # Host providing the admin Identity API endpoint (string | ||
| 722 | # value) | ||
| 723 | auth_host=%CONTROLLER_IP% | ||
| 724 | |||
| 725 | # Port of the admin Identity API endpoint (integer value) | ||
| 726 | #auth_port=35357 | ||
| 727 | |||
| 728 | # Protocol of the admin Identity API endpoint(http or https) | ||
| 729 | # (string value) | ||
| 730 | auth_protocol=http | ||
| 731 | |||
| 732 | # Complete public Identity API endpoint (string value) | ||
| 733 | #auth_uri=<None> | ||
| 734 | |||
| 735 | # API version of the admin Identity API endpoint (string | 721 | # API version of the admin Identity API endpoint (string |
| 736 | # value) | 722 | # value) |
| 737 | #auth_version=<None> | 723 | #auth_version=<None> |
