Skip to content

Commit 12a462f

Browse files
authored
fix: (IAC-1090) Fixed jumpvm cloud-init causing Viya deployment failure (#327)
1 parent d3188e2 commit 12a462f

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

files/cloud-init/jump/cloud-config

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@ runcmd:
4343
# mount the nfs
4444
#
4545
- while [ `df -h | grep "${rwx_filestore_endpoint}:${rwx_filestore_path}" | wc -l` -eq 0 ]; do sleep 5 && mount -a ; done
46-
#
47-
# Change permissions and owner
48-
#
49-
- mkdir -p ${jump_rwx_filestore_path}/pvs
50-
- $(chmod -fR 777 ${jump_rwx_filestore_path} ; echo)
51-
- $(chown -R nobody:nogroup ${jump_rwx_filestore_path} ; echo)
46+
- if ! [ -d "${jump_rwx_filestore_path}/pvs" ]
47+
- then
48+
#
49+
# Change permissions and owner
50+
#
51+
- mkdir -p ${jump_rwx_filestore_path}/pvs
52+
- $(chmod -fR 777 ${jump_rwx_filestore_path} ; echo)
53+
- $(chown -R nobody:nogroup ${jump_rwx_filestore_path} ; echo)
54+
- fi
5255
- fi
5356
#
5457
# Update user for Docker, user=${vm_admin}

outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ output "cluster_api_mode" {
147147

148148
## Message Broker - Azure Service Bus
149149
output "message_broker_hostname" {
150-
value = element(flatten(module.message_broker[*].message_broker_hostname), 0)
150+
value = var.create_azure_message_broker ? element(flatten(module.message_broker[*].message_broker_hostname), 0) : null
151151
}
152152

153153
output "message_broker_primary_key" {
154-
value = element(coalescelist(module.message_broker[*].message_broker_primary_key, [""]), 0)
154+
value = var.create_azure_message_broker ? element(coalescelist(module.message_broker[*].message_broker_primary_key, [""]), 0) : null
155155
sensitive = true
156156
}
157157

158158
output "message_broker_name" {
159-
value = var.message_broker_name
159+
value = var.create_azure_message_broker ? var.message_broker_name : null
160160
}

0 commit comments

Comments
 (0)