summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@att.com>2019-12-17 14:55:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-12-17 14:55:28 +0000
commit6d9c822f81bce509ca568df207efe6e797d45b6d (patch)
tree97aaab276cbd65fbbc1cdde51b7e820174b4cbfd
parent97b8870310423c01a61210f9e9a3f93d59829df2 (diff)
parent5ad445c2b93c4f55b29512e7daf89d73ddc67b94 (diff)
Merge "Uplift intel-pod17 to Treasuremap v1.7"
-rw-r--r--site/intel-pod17/secrets/passphrases/private_docker_key.yaml14
-rw-r--r--site/intel-pod17/site-definition.yaml2
2 files changed, 15 insertions, 1 deletions
diff --git a/site/intel-pod17/secrets/passphrases/private_docker_key.yaml b/site/intel-pod17/secrets/passphrases/private_docker_key.yaml
new file mode 100644
index 0000000..b423174
--- /dev/null
+++ b/site/intel-pod17/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-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml
index adad752..d89dc73 100644
--- a/site/intel-pod17/site-definition.yaml
+++ b/site/intel-pod17/site-definition.yaml
@@ -12,6 +12,6 @@ data:
repositories:
global:
- revision: v1.6
+ revision: v1.7
url: https://opendev.org/airship/treasuremap.git
...