Browse Source

Merge "Make service account configurable"

changes/33/425733/15
Jenkins 2 years ago
parent
commit
0563e47d58
2 changed files with 10 additions and 1 deletions
  1. 4
    0
      service/files/defaults.yaml
  2. 6
    1
      service/keystone.yaml

+ 4
- 0
service/files/defaults.yaml View File

@@ -32,6 +32,10 @@ configs:
32 32
     project_name: admin
33 33
     role_name: admin
34 34
 
35
+  service_account:
36
+    domain: default
37
+    project: service
38
+
35 39
 sources:
36 40
   openstack/keystone:
37 41
     git_url: https://git.openstack.org/openstack/keystone.git

+ 6
- 1
service/keystone.yaml View File

@@ -78,9 +78,14 @@ service:
78 78
           - keystone-fernet
79 79
         command: daemon.sh
80 80
       post:
81
+        - name: keystone-create-domain
82
+          type: single
83
+          command: openstack domain create --or-show {{ service_account.domain }}
81 84
         - name: keystone-create-project
82 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
 
85 90
 files:
86 91
   keystone-conf:

Loading…
Cancel
Save