From e9c7fa144c6e9e1126e5afe85b152e9f01029802 Mon Sep 17 00:00:00 2001 From: James Gu Date: Tue, 3 Mar 2020 11:45:05 -0800 Subject: Upgrade pod 10 and 15 to Treasuremap 1.7 Upgraded site definition manifest to refer to TM v1.7 and added private docker key. Change-Id: Ica9e1f09ad3c48cbd07d70ab590dd1c45b0cafb8 Signed-off-by: James Gu --- .../secrets/passphrases/private_docker_key.yaml | 14 ++++++++++++++ site/intel-pod10/site-definition.yaml | 2 +- .../secrets/passphrases/private_docker_key.yaml | 14 ++++++++++++++ site/intel-pod15/site-definition.yaml | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 site/intel-pod10/secrets/passphrases/private_docker_key.yaml create mode 100644 site/intel-pod15/secrets/passphrases/private_docker_key.yaml diff --git a/site/intel-pod10/secrets/passphrases/private_docker_key.yaml b/site/intel-pod10/secrets/passphrases/private_docker_key.yaml new file mode 100644 index 0000000..b423174 --- /dev/null +++ b/site/intel-pod10/secrets/passphrases/private_docker_key.yaml @@ -0,0 +1,14 @@ +--- +schema: deckhand/Passphrase/v1 +metadata: + schema: metadata/Document/v1 + name: private_docker_key + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +# sample key for potential private docker registry +# see Docker documentation for info on how to generate the key +# base64 of password123 +data: cGFzc3dvcmQxMjM= +... diff --git a/site/intel-pod10/site-definition.yaml b/site/intel-pod10/site-definition.yaml index f435f04..33a0e33 100644 --- a/site/intel-pod10/site-definition.yaml +++ b/site/intel-pod10/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.6 + revision: v1.7 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod15/secrets/passphrases/private_docker_key.yaml b/site/intel-pod15/secrets/passphrases/private_docker_key.yaml new file mode 100644 index 0000000..b423174 --- /dev/null +++ b/site/intel-pod15/secrets/passphrases/private_docker_key.yaml @@ -0,0 +1,14 @@ +--- +schema: deckhand/Passphrase/v1 +metadata: + schema: metadata/Document/v1 + name: private_docker_key + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +# sample key for potential private docker registry +# see Docker documentation for info on how to generate the key +# base64 of password123 +data: cGFzc3dvcmQxMjM= +... diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index ad0ce21..dfafb62 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.6 + revision: v1.7 url: https://opendev.org/airship/treasuremap.git ... -- cgit 1.2.3-korg