summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-10 10:05:30 +0000
committerGerrit Code Review <review@openstack.org>2017-03-10 10:05:30 +0000
commitd79f2e5a1c9586751d08a98a6d1e7e11d9688b1d (patch)
tree8cfe9a3c48161135b88fc81a149702597f596d9f
parentb720b58319452c6c6fbe4a9375275d4447fefc62 (diff)
parent176a573cae509f14b7eeef47e8eb3ad03ceec24f (diff)
Merge "Store sensitive configs in secret"
-rw-r--r--service/files/defaults.yaml23
1 files changed, 13 insertions, 10 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index ed13d64..b89d2dc 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -7,21 +7,11 @@ configs:
7 ingress: image 7 ingress: image
8 registry_port: 8 registry_port:
9 cont: 9191 9 cont: 9191
10 db:
11 username: glance
12 password: password
13 name: glance
14
15 user: glance
16 password: password
17 10
18 debug: false 11 debug: false
19 12
20 ceph: 13 ceph:
21 enable: false 14 enable: false
22 key: "Changeme"
23 username: "glance"
24 pool_name: "images"
25 15
26 swift: 16 swift:
27 enable: false 17 enable: false
@@ -36,6 +26,19 @@ configs:
36 disk_format: qcow2 26 disk_format: qcow2
37 name: cirros 27 name: cirros
38 28
29secret_configs:
30 glance:
31 db:
32 username: glance
33 password: password
34 name: glance
35 user: glance
36 password: password
37 ceph:
38 key: "Changeme"
39 username: "glance"
40 pool_name: "images"
41
39sources: 42sources:
40 openstack/glance: 43 openstack/glance:
41 git_url: https://git.openstack.org/openstack/glance.git 44 git_url: https://git.openstack.org/openstack/glance.git