From 380540a779e1379c6ea1ab85d6398ae86f54e177 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Thu, 1 Feb 2024 15:08:36 +0100 Subject: [PATCH] Use devstack helper functions in the plugin Using get_or_.*_role functions is useful when deploying 2 devstack instances in 2 different regions with a unique keystone instance, the functions ensure that the changes haven't already been applied Change-Id: I95d75b1bc3a62bb2758a4c5985dcfb9e6cc12449 --- devstack/plugin.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3c86a9c5de..ac1998d1fc 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -748,12 +748,12 @@ function octavia_cleanup { } function add_load-balancer_roles { - openstack role create load-balancer_observer - openstack role create load-balancer_global_observer - openstack role create load-balancer_member - openstack role create load-balancer_admin - openstack role create load-balancer_quota_admin - openstack role add --user demo --project demo load-balancer_member + get_or_create_role load-balancer_observer + get_or_create_role load-balancer_global_observer + get_or_create_role load-balancer_member + get_or_create_role load-balancer_admin + get_or_create_role load-balancer_quota_admin + get_or_add_user_project_role load-balancer_member demo demo } function octavia_init {