summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-14 10:32:58 +0000
committerGerrit Code Review <review@openstack.org>2017-02-14 10:32:58 +0000
commit0563e47d58abb43c76c179d60b82b329e9531e27 (patch)
treefcc813cd06774a0bd2facc8455cc399ef0aef074
parentefb0046354e2a9ed6a9dddf4b244a904fda535ad (diff)
parentc236b0776b61562045d91ba907c278725e19aec0 (diff)
Merge "Make service account configurable"
-rw-r--r--service/files/defaults.yaml4
-rw-r--r--service/keystone.yaml7
2 files changed, 10 insertions, 1 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 94f718e..e7e4f9d 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -32,6 +32,10 @@ configs:
32 project_name: admin 32 project_name: admin
33 role_name: admin 33 role_name: admin
34 34
35 service_account:
36 domain: default
37 project: service
38
35sources: 39sources:
36 openstack/keystone: 40 openstack/keystone:
37 git_url: https://git.openstack.org/openstack/keystone.git 41 git_url: https://git.openstack.org/openstack/keystone.git
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 3ed22da..bb615d9 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -78,9 +78,14 @@ service:
78 - keystone-fernet 78 - keystone-fernet
79 command: daemon.sh 79 command: daemon.sh
80 post: 80 post:
81 - name: keystone-create-domain
82 type: single
83 command: openstack domain create --or-show {{ service_account.domain }}
81 - name: keystone-create-project 84 - name: keystone-create-project
82 type: single 85 type: single
83 command: openstack project create service 86 dependencies:
87 - keystone-create-domain
88 command: openstack project create --domain {{ service_account.domain }} {{ service_account.project }}
84 89
85files: 90files:
86 keystone-conf: 91 keystone-conf: