Skip to content

Commit 00b1a74

Browse files
committed
Fix configure.sh idepmpotency with project and application acls
1 parent 43471cf commit 00b1a74

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ansible-bootstrap/templates/configure.sh.j2

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
# This script is idempotent.
55
#
66
# Path structure:
7+
# /acl/<system_acl_policy_name>.aclpolicy
78
# /projects/<project_name>/<job_name>.yaml
8-
# /projects/<project_name>/<acl_policy_name>.aclpolicy
9+
# /projects/<project_name>/<project_acl_policy_name>.aclpolicy
910
#
1011
# Using:
1112
# - https://rundeck.github.io/rundeck-cli/commands/
@@ -51,7 +52,7 @@ get_installed_projects() {
5152

5253
create_project() {
5354
echo "> Creating project ${1}"
54-
rd projects create --project "${1}"
55+
rd projects create --project "${1}" || true
5556
}
5657

5758
load_project_job() {
@@ -67,9 +68,10 @@ load_project_acl() {
6768
}
6869

6970
load_application_acl() {
70-
# Load application ACL policies to database
71+
# Load application ACL policies to database (need to create and delete, as this command isn't idempotent, also outputs whole policy which is undesirable)
7172
echo "> Loading ACL $(basename "${1}")"
72-
rd system acls create --file "${1}" --name=$(basename "${1}")
73+
rd system acls delete --name "$(basename "${1}")" || true
74+
rd system acls create --file "${1}" --name=$(basename "${1}") 1> /dev/null && echo "# Created System ACL Policy ${1}"
7375
}
7476

7577
contains() {

0 commit comments

Comments
 (0)