From 92ef88f48165d6ab17afd419e772bd0000fbd6fd Mon Sep 17 00:00:00 2001 From: "Venkata, Krishna (kv988c)" Date: Thu, 20 Jun 2019 16:58:55 -0500 Subject: [PATCH] [airship]: Remove duplicate values BaremetalNode/v1.yaml: volume_group is defined twice in same section in lines 58 and 66. HostProfile/v1.yaml: volume_group is defined twice in same section in lines 49 and 57. SoftwareVersions/v1.yaml: type is defined twice for dep_check config/service_accounts.yaml: user_domain_name defined twice in same section in lines 109 and 114. config/service_accounts.yaml: user_domain_name defined twice in same section in lines 111 and 116. Change-Id: I1597c0afc6b3a9674c0c74692f6575d797bd714d --- global/schemas/drydock/BaremetalNode/v1.yaml | 2 -- global/schemas/drydock/HostProfile/v1.yaml | 2 -- global/schemas/pegleg/SoftwareVersions/v1.yaml | 1 - site/airskiff/software/config/service_accounts.yaml | 1 - site/seaworthy/software/config/service_accounts.yaml | 1 - type/sloop/config/service_accounts.yaml | 1 - 6 files changed, 8 deletions(-) diff --git a/global/schemas/drydock/BaremetalNode/v1.yaml b/global/schemas/drydock/BaremetalNode/v1.yaml index 2902f79f3..a3b555e49 100644 --- a/global/schemas/drydock/BaremetalNode/v1.yaml +++ b/global/schemas/drydock/BaremetalNode/v1.yaml @@ -63,8 +63,6 @@ data: type: 'string' bootable: type: 'boolean' - volume_group: - type: 'string' filesystem: type: 'object' properties: diff --git a/global/schemas/drydock/HostProfile/v1.yaml b/global/schemas/drydock/HostProfile/v1.yaml index 642bb6620..0a6d11183 100644 --- a/global/schemas/drydock/HostProfile/v1.yaml +++ b/global/schemas/drydock/HostProfile/v1.yaml @@ -54,8 +54,6 @@ data: type: 'string' bootable: type: 'boolean' - volume_group: - type: 'string' filesystem: type: 'object' properties: diff --git a/global/schemas/pegleg/SoftwareVersions/v1.yaml b/global/schemas/pegleg/SoftwareVersions/v1.yaml index eeb89255d..fb852d7ee 100644 --- a/global/schemas/pegleg/SoftwareVersions/v1.yaml +++ b/global/schemas/pegleg/SoftwareVersions/v1.yaml @@ -1069,7 +1069,6 @@ data: type: string dep_check: type: string - type: string image_repo_sync: type: string ceph-rgw: diff --git a/site/airskiff/software/config/service_accounts.yaml b/site/airskiff/software/config/service_accounts.yaml index e5ecd4950..5a0d40722 100644 --- a/site/airskiff/software/config/service_accounts.yaml +++ b/site/airskiff/software/config/service_accounts.yaml @@ -111,7 +111,6 @@ data: # NEWSITE-CHANGEME: Replace with the site name region_name: RegionOne role: admin - user_domain_name: default username: armada deckhand: keystone: diff --git a/site/seaworthy/software/config/service_accounts.yaml b/site/seaworthy/software/config/service_accounts.yaml index e5ecd4950..5a0d40722 100644 --- a/site/seaworthy/software/config/service_accounts.yaml +++ b/site/seaworthy/software/config/service_accounts.yaml @@ -111,7 +111,6 @@ data: # NEWSITE-CHANGEME: Replace with the site name region_name: RegionOne role: admin - user_domain_name: default username: armada deckhand: keystone: diff --git a/type/sloop/config/service_accounts.yaml b/type/sloop/config/service_accounts.yaml index 901e3e1a1..7758da39d 100644 --- a/type/sloop/config/service_accounts.yaml +++ b/type/sloop/config/service_accounts.yaml @@ -113,7 +113,6 @@ data: # NEWSITE-CHANGEME: Replace with the site name region_name: RegionOne role: admin - user_domain_name: default username: armada deckhand: keystone: