add host service iam role

2 files changed, 8 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java
index 85b042d584c..049b3a1a929 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/NoopRoleService.java
@@ -18,7 +18,7 @@ public class NoopRoleService implements RoleService {
 
     @Override
     public TenantRoles getTenantRole(TenantName tenant) {
-        return new TenantRoles(tenant.value() + "-host-role", tenant.value() + "-tenant-role");
+        return new TenantRoles(tenant.value() + "-host-role", tenant.value() + "-host-service-role", tenant.value() + "-tenant-role");
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java
index 4c5e3257d0e..af9e42e4262 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/TenantRoles.java
@@ -6,10 +6,12 @@ package com.yahoo.vespa.hosted.controller.api.integration.aws;
  */
 public class TenantRoles {
     private final String hostRole;
+    private final String hostServiceRole;
     private final String containerRole;
 
-    public TenantRoles(String hostRole, String containerRole) {
+    public TenantRoles(String hostRole, String hostServiceRole, String containerRole) {
         this.hostRole = hostRole;
+        this.hostServiceRole = hostServiceRole;
         this.containerRole = containerRole;
     }
 
@@ -17,6 +19,10 @@ public class TenantRoles {
         return hostRole;
     }
 
+    public String hostServiceRole() {
+        return hostServiceRole;
+    }
+
     public String containerRole() {
         return containerRole;
     }