diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-13 15:58:55 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-25 15:25:37 -0500 |
commit | f45c9eaf089983dc8820cf0f10aa99ef0115835f (patch) | |
tree | 1f74bd6e3e86c4c1e42a6999d851de91830d788b /meta-openstack/recipes-devtools/python/python-heat | |
parent | 467b613638a0208cfbaaab5d54e07431255408fa (diff) | |
download | meta-cloud-services-f45c9eaf089983dc8820cf0f10aa99ef0115835f.tar.gz |
python-heat: update heat.conf with keystone authentication information
The authentication information was in the wrong section of the .conf
file, which mean that the stack api was not able to properly authenticate.
Creating a new keystone section fixes the problem and we can now manipulate
stacks.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-heat')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-heat/heat.conf | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.conf b/meta-openstack/recipes-devtools/python/python-heat/heat.conf index 2ff8adb..da72987 100644 --- a/meta-openstack/recipes-devtools/python/python-heat/heat.conf +++ b/meta-openstack/recipes-devtools/python/python-heat/heat.conf | |||
@@ -4,10 +4,6 @@ | |||
4 | # Options defined in heat.common.config | 4 | # Options defined in heat.common.config |
5 | # | 5 | # |
6 | 6 | ||
7 | admin_tenant_name = %SERVICE_TENANT_NAME% | ||
8 | admin_user = heat | ||
9 | admin_password = %ADMIN_PASSWORD% | ||
10 | |||
11 | # The SQLAlchemy connection string used to connect to the | 7 | # The SQLAlchemy connection string used to connect to the |
12 | # database (string value) | 8 | # database (string value) |
13 | #sql_connection=mysql://heat:heat@localhost/heat | 9 | #sql_connection=mysql://heat:heat@localhost/heat |
@@ -728,4 +724,13 @@ sql_connection=postgresql://%DB_USER%:%DB_PASSWORD%@localhost/heat | |||
728 | # Password for Redis server. (optional) (string value) | 724 | # Password for Redis server. (optional) (string value) |
729 | #password=<None> | 725 | #password=<None> |
730 | 726 | ||
727 | [keystone_authtoken] | ||
728 | auth_host = %CONTROLLER_IP% | ||
729 | auth_port = 35357 | ||
730 | auth_protocol = http | ||
731 | auth_uri = http://%CONTROLLER_IP%:5000/v2.0 | ||
732 | |||
733 | admin_tenant_name = %SERVICE_TENANT_NAME% | ||
734 | admin_user = heat | ||
735 | admin_password = %ADMIN_PASSWORD% | ||
731 | 736 | ||