14931: Change default tag prefix to "Arvados".

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 5a482e2d2269a3832f284386676b6f28903c7f66..94cd8fcbf65d2181c918818f7ba4779408b281a0 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -538,15 +538,15 @@ Clusters:
           SAMPLE: "tag value"
 
         # Prefix for predefined tags used by Arvados (InstanceSetID,
-        # InstanceType, InstanceSecret, IdleBehavior). For example,
-        # set to "arvados-" to use tag key "arvados-InstanceSecret"
-        # instead of "InstanceSecret".
+        # InstanceType, InstanceSecret, IdleBehavior). With the
+        # default value "Arvados", tags are "ArvadosInstanceSetID",
+        # "ArvadosInstanceSecret", etc.
         #
         # This should only be changed while no cloud resources are in
         # use and the cloud dispatcher is not running. Otherwise,
         # VMs/resources that were added using the old tag prefix will
         # need to be detected and cleaned up manually.
-        TagKeyPrefix: ""
+        TagKeyPrefix: Arvados
 
         # Cloud driver: "azure" (Microsoft Azure) or "ec2" (Amazon AWS).
         Driver: ec2

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index e34203dc8294441e71a9272985e967942768ff57..3492615e9959f48f6e3134f733194e93af043e93 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -544,15 +544,15 @@ Clusters:
           SAMPLE: "tag value"
 
         # Prefix for predefined tags used by Arvados (InstanceSetID,
-        # InstanceType, InstanceSecret, IdleBehavior). For example,
-        # set to "arvados-" to use tag key "arvados-InstanceSecret"
-        # instead of "InstanceSecret".
+        # InstanceType, InstanceSecret, IdleBehavior). With the
+        # default value "Arvados", tags are "ArvadosInstanceSetID",
+        # "ArvadosInstanceSecret", etc.
         #
         # This should only be changed while no cloud resources are in
         # use and the cloud dispatcher is not running. Otherwise,
         # VMs/resources that were added using the old tag prefix will
         # need to be detected and cleaned up manually.
-        TagKeyPrefix: ""
+        TagKeyPrefix: Arvados
 
         # Cloud driver: "azure" (Microsoft Azure) or "ec2" (Amazon AWS).
         Driver: ec2