From: James Gu <james.gu@att.com>
Date: Tue, 3 Mar 2020 19:45:05 +0000 (-0800)
Subject: Upgrade pod 10 and 15 to Treasuremap 1.7
X-Git-Tag: opnfv-10.0.0~25
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F69752%2F1;p=airship.git

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 <james.gu@att.com>
---

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
 ...