Pass through Ceph network to OpenStack

milliams · milliams · commit 90b1327f3211 · 2023-10-31T18:27:07.000Z
diff --git a/openstack/datasources.tf b/openstack/datasources.tf
@@ -14,6 +14,7 @@ data "template_file" "user_data" {
         network_id = openstack_networking_network_v2.cluster.id
         network_name = openstack_networking_network_v2.cluster.name
         security_group = openstack_networking_secgroup_v2.cluster.name
+        ceph_network = data.openstack_networking_network_v2.external_ceph.id
         ceph_secret = openstack_sharedfilesystem_share_access_v2.cluster_fs_access.access_key
       }
     )
diff --git a/openstack/files/bootstrap_custom.sh.tpl b/openstack/files/bootstrap_custom.sh.tpl
@@ -11,6 +11,7 @@ security_group: ${security_group}
 cluster_id: ${cluster_id}
 ansible_repo: ${ansible_repo}
 ansible_branch: ${ansible_branch}
+ceph_network: ${ceph_network}
 EOF
 
 mkdir -p /etc/ansible/facts.d/

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ data "template_file" "user_data" {`
`14`	`14`	`network_id = openstack_networking_network_v2.cluster.id`
`15`	`15`	`network_name = openstack_networking_network_v2.cluster.name`
`16`	`16`	`security_group = openstack_networking_secgroup_v2.cluster.name`
	`17`	`+ ceph_network = data.openstack_networking_network_v2.external_ceph.id`
`17`	`18`	`ceph_secret = openstack_sharedfilesystem_share_access_v2.cluster_fs_access.access_key`
`18`	`19`	`}`
`19`	`20`	`)`