summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-07 17:05:40 +0000
committerGerrit Code Review <review@openstack.org>2019-01-07 17:05:40 +0000
commit7db4b789f26a97a9988c5bca13e9833df5f0017f (patch)
treeefa844e782f659854fe5c538bb74e57fc3ad6d8d
parent7343c2774535c79a0ba2309dacb4aa1181a60a53 (diff)
parentfe82bacefb6fc7671388e32c51e768533c21f11a (diff)
Merge "Remove duplicate region overrides for barbican"
-rw-r--r--site/airship-seaworthy/software/config/service_accounts.yaml6
-rw-r--r--site/airskiff/software/config/service_accounts.yaml6
2 files changed, 0 insertions, 12 deletions
diff --git a/site/airship-seaworthy/software/config/service_accounts.yaml b/site/airship-seaworthy/software/config/service_accounts.yaml
index accf559..9782a66 100644
--- a/site/airship-seaworthy/software/config/service_accounts.yaml
+++ b/site/airship-seaworthy/software/config/service_accounts.yaml
@@ -220,12 +220,6 @@ metadata:
220 path: .osh.region_name 220 path: .osh.region_name
221 dest: 221 dest:
222 path: .osh.barbican.barbican.region_name 222 path: .osh.barbican.barbican.region_name
223 - src:
224 schema: pegleg/CommonSoftwareConfig/v1
225 name: common-software-config
226 path: .osh.region_name
227 dest:
228 path: .osh.barbican.barbican.region_name
229data: 223data:
230 osh: 224 osh:
231 keystone: 225 keystone:
diff --git a/site/airskiff/software/config/service_accounts.yaml b/site/airskiff/software/config/service_accounts.yaml
index accf559..9782a66 100644
--- a/site/airskiff/software/config/service_accounts.yaml
+++ b/site/airskiff/software/config/service_accounts.yaml
@@ -220,12 +220,6 @@ metadata:
220 path: .osh.region_name 220 path: .osh.region_name
221 dest: 221 dest:
222 path: .osh.barbican.barbican.region_name 222 path: .osh.barbican.barbican.region_name
223 - src:
224 schema: pegleg/CommonSoftwareConfig/v1
225 name: common-software-config
226 path: .osh.region_name
227 dest:
228 path: .osh.barbican.barbican.region_name
229data: 223data:
230 osh: 224 osh:
231 keystone: 225 keystone: