diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-02-03 16:01:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 16:01:49 +0100 |
| commit | 5f7c6b8ba3529e587496f1aaf11eaceb41789ac2 (patch) | |
| tree | 53e6b7c440df284cedd93adcc70b94b5b07df71d /flags | |
| parent | 7a6d98584888c174ef0a2dbc749a970227784479 (diff) | |
| parent | 4b45a7684bdcbb1c1c044755c5d81a9a3b3e6326 (diff) | |
Merge pull request #16299 from vespa-engine/olaa/create-cloud-role
Create role at tenant creation
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 075166e4759..c5a9eb5ca5f 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -12,11 +12,7 @@ import java.util.List; import java.util.Optional; import java.util.TreeMap; -import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; -import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME; -import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE; -import static com.yahoo.vespa.flags.FetchVector.Dimension.VESPA_VERSION; -import static com.yahoo.vespa.flags.FetchVector.Dimension.ZONE_ID; +import static com.yahoo.vespa.flags.FetchVector.Dimension.*; /** * Definitions of feature flags. @@ -140,19 +136,19 @@ public class Flags { "Override the default dist host for yum.", "Takes effect on next tick or on host-admin restart (may vary where used)."); - public static final UnboundBooleanFlag PROVISION_APPLICATION_ROLES = defineFeatureFlag( - "provision-application-roles", false, + public static final UnboundBooleanFlag PROVISION_TENANT_ROLES = defineFeatureFlag( + "provision-tenant-roles", false, List.of("tokle"), "2020-12-02", "2021-04-01", - "Whether application roles should be provisioned", + "Whether tenant roles should be provisioned", "Takes effect on next deployment (controller)", - ZONE_ID); + TENANT_ID); - public static final UnboundBooleanFlag APPLICATION_IAM_ROLE = defineFeatureFlag( + public static final UnboundBooleanFlag TENANT_IAM_ROLE = defineFeatureFlag( "application-iam-roles", false, List.of("tokle"), "2020-12-02", "2021-04-01", "Allow separate iam roles when provisioning/assigning hosts", "Takes effect immediately on new hosts, on next redeploy for applications", - APPLICATION_ID); + TENANT_ID); public static final UnboundIntFlag MAX_TRIAL_TENANTS = defineIntFlag( "max-trial-tenants", -1, |