summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Shakhat <ishakhat@mirantis.com>2016-12-09 13:07:49 +0400
committerIlya Shakhat <ishakhat@mirantis.com>2016-12-09 13:08:48 +0400
commit2cfef3bc3ab54f07d2b64da05b465382ed8c774e (patch)
tree1c42c422b1ee34b8e880ee8f38ea73a04ba60cc5
parent1cdf3d783d3c5f3bdd3578e9f106132234b129cf (diff)
Heat user should belong to "service" project, not "admin"
Reconfigure Heat user to be in "service" project like all other services do. Change-Id: I08b5d672e8dee9efe1a9161f9b903c4e9fd54786
Notes
Notes (review): Code-Review+2: Andrey Pavlov <apavlov@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Workflow+1: Proskurin Kirill <kproskurin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 09 Dec 2016 09:55:11 +0000 Reviewed-on: https://review.openstack.org/409037 Project: openstack/fuel-ccp-heat Branch: refs/heads/master
-rw-r--r--service/files/heat.conf.j22
-rw-r--r--service/heat-api.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/service/files/heat.conf.j2 b/service/files/heat.conf.j2
index fd810bc..53e4ef5 100644
--- a/service/files/heat.conf.j2
+++ b/service/files/heat.conf.j2
@@ -31,7 +31,7 @@ auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
31auth_type = password 31auth_type = password
32project_domain_id = default 32project_domain_id = default
33user_domain_id = default 33user_domain_id = default
34project_name = {{ openstack.project_name }} 34project_name = service
35username = {{ heat.user }} 35username = {{ heat.user }}
36password = {{ heat.password }} 36password = {{ heat.password }}
37memcached_servers = {{ address('memcached', memcached.port) }} 37memcached_servers = {{ address('memcached', memcached.port) }}
diff --git a/service/heat-api.yaml b/service/heat-api.yaml
index 9f99db0..2dc1666 100644
--- a/service/heat-api.yaml
+++ b/service/heat-api.yaml
@@ -38,7 +38,7 @@ service:
38 - heat-user-create 38 - heat-user-create
39 type: single 39 type: single
40 command: 40 command:
41 openstack role add --project {{ openstack.project_name }} --user {{ heat.user }} admin 41 openstack role add --project service --user {{ heat.user }} admin
42 - name: heat-service-create 42 - name: heat-service-create
43 dependencies: 43 dependencies:
44 - keystone-create-project 44 - keystone-create-project