diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-19 00:11:26 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-19 00:11:26 -0500 |
commit | 76417f9cc6be3a1d9173a6305ad351a1742b345b (patch) | |
tree | 2e408380d0ebf40242a5a22d6ecffad1f273dfad | |
parent | 18143fcd0c78654a1d1bc69bf6457c478d3611c6 (diff) | |
download | meta-cloud-services-76417f9cc6be3a1d9173a6305ad351a1742b345b.tar.gz |
ceilometer: update to stable/havana latest
Updating the ceilometer component to the latest havana stable updates.
Of note in the update is the removel of the old global statistics table
for ceilometer.
To properly display metering statistics after this update the keystone
credentials need to be udpated in keystone (add ceilometer with an
admin role) and ceilometer to use the proper username/password to
authenticate.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
3 files changed, 7 insertions, 6 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf index 457199d..abeb65c 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf | |||
@@ -718,14 +718,14 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0 | |||
718 | 718 | ||
719 | # Host providing the admin Identity API endpoint (string | 719 | # Host providing the admin Identity API endpoint (string |
720 | # value) | 720 | # value) |
721 | #auth_host=127.0.0.1 | 721 | auth_host=%CONTROLLER_IP% |
722 | 722 | ||
723 | # Port of the admin Identity API endpoint (integer value) | 723 | # Port of the admin Identity API endpoint (integer value) |
724 | #auth_port=35357 | 724 | #auth_port=35357 |
725 | 725 | ||
726 | # Protocol of the admin Identity API endpoint(http or https) | 726 | # Protocol of the admin Identity API endpoint(http or https) |
727 | # (string value) | 727 | # (string value) |
728 | #auth_protocol=https | 728 | auth_protocol=http |
729 | 729 | ||
730 | # Complete public Identity API endpoint (string value) | 730 | # Complete public Identity API endpoint (string value) |
731 | #auth_uri=<None> | 731 | #auth_uri=<None> |
@@ -759,14 +759,14 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0 | |||
759 | #admin_token=<None> | 759 | #admin_token=<None> |
760 | 760 | ||
761 | # Keystone account username (string value) | 761 | # Keystone account username (string value) |
762 | #admin_user=<None> | 762 | admin_user=ceilometer |
763 | 763 | ||
764 | # Keystone account password (string value) | 764 | # Keystone account password (string value) |
765 | #admin_password=<None> | 765 | admin_password=%ADMIN_PASSWORD% |
766 | 766 | ||
767 | # Keystone service account tenant name to validate user tokens | 767 | # Keystone service account tenant name to validate user tokens |
768 | # (string value) | 768 | # (string value) |
769 | #admin_tenant_name=admin | 769 | admin_tenant_name=%SERVICE_TENANT_NAME% |
770 | 770 | ||
771 | # Env key for the swift cache (string value) | 771 | # Env key for the swift cache (string value) |
772 | #cache=<None> | 772 | #cache=<None> |
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb index c0d3df4..7362733 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb | |||
@@ -17,7 +17,7 @@ PR = "r0" | |||
17 | SRC_URI = "git://github.com/openstack/python-ceilometerclient.git;branch=master" | 17 | SRC_URI = "git://github.com/openstack/python-ceilometerclient.git;branch=master" |
18 | 18 | ||
19 | PV="1.0.6+git${SRCPV}" | 19 | PV="1.0.6+git${SRCPV}" |
20 | SRCREV="067b76d9a821c3acb60d93787396d25b729a7421" | 20 | SRCREV="4c42f5052678539648a1051a526b82ab95269a2b" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit setuptools | 23 | inherit setuptools |
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh index edf29ef..bf5aca7 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh +++ b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh | |||
@@ -143,6 +143,7 @@ keystone user-role-list --user-id $DEMO_USER --tenant-id $DEMO_TENANT &> /dev/nu | |||
143 | keystone user-role-add --tenant-id $DEMO_TENANT --user-id $DEMO_USER --role-id $MEMBER_ROLE | 143 | keystone user-role-add --tenant-id $DEMO_TENANT --user-id $DEMO_USER --role-id $MEMBER_ROLE |
144 | 144 | ||
145 | keystone user-role-list --user-id $CEILOMETER_USER --tenant_id $SERVICE_TENANT &> /dev/null | 145 | keystone user-role-list --user-id $CEILOMETER_USER --tenant_id $SERVICE_TENANT &> /dev/null |
146 | keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CEILOMETER_USER --role-id $ADMIN_ROLE | ||
146 | keystone user-role-add --tenant_id $SERVICE_TENANT --user_id $CEILOMETER_USER --role-id $RESELLER_ADMIN_ROLE | 147 | keystone user-role-add --tenant_id $SERVICE_TENANT --user_id $CEILOMETER_USER --role-id $RESELLER_ADMIN_ROLE |
147 | 148 | ||
148 | keystone user-role-add --tenant_id $SERVICE_TENANT --user-id $HEAT_USER --role-id $ADMIN_ROLE | 149 | keystone user-role-add --tenant_id $SERVICE_TENANT --user-id $HEAT_USER --role-id $ADMIN_ROLE |