Skip to content

Commit

Permalink
fix: use [email protected] in TF modules (#422)
Browse files Browse the repository at this point in the history
  • Loading branch information
patriciareinoso authored Dec 18, 2024
1 parent 8b0643f commit 8513a9c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resource "juju_application" "nms" {
name = "sdcore-nms-k8s"
channel = var.channel
revision = var.revision
base = var.base
}

config = var.config
Expand Down
6 changes: 6 additions & 0 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ variable "revision" {
default = null
}

variable "base" {
description = "The operating system on which to deploy"
type = string
default = "[email protected]"
}

variable "units" {
description = "Number of units to deploy"
type = number
Expand Down
5 changes: 5 additions & 0 deletions tests/integration/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
UPF_CHARM_NAME = "sdcore-upf-k8s"
UPF_CHARM_CHANNEL = "1.5/edge"
UPF_RELATION_NAME = "fiveg_n4"
SDCORE_CHARMS_SERIES = "noble"
TLS_PROVIDER_CHARM_NAME = "self-signed-certificates"
TLS_PROVIDER_CHARM_CHANNEL = "latest/stable"
TRAEFIK_CHARM_NAME = "traefik-k8s"
Expand Down Expand Up @@ -105,6 +106,7 @@ async def _deploy_sdcore_upf(ops_test: OpsTest):
UPF_CHARM_NAME,
application_name=UPF_CHARM_NAME,
channel=UPF_CHARM_CHANNEL,
series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="[email protected]" once it's properly supported # noqa: E501
trust=True,
)

Expand All @@ -115,6 +117,7 @@ async def _deploy_nrf(ops_test: OpsTest):
NRF_CHARM_NAME,
application_name=NRF_CHARM_NAME,
channel=NRF_CHARM_CHANNEL,
series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="[email protected]" once it's properly supported # noqa: E501
)
await ops_test.model.integrate(
relation1=f"{NRF_CHARM_NAME}:database", relation2=f"{DATABASE_APP_NAME}"
Expand All @@ -128,6 +131,7 @@ async def _deploy_sdcore_gnbsim(ops_test: OpsTest):
GNBSIM_CHARM_NAME,
application_name=GNBSIM_CHARM_NAME,
channel=GNBSIM_CHARM_CHANNEL,
series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="[email protected]" once it's properly supported # noqa: E501
trust=True,
)

Expand All @@ -147,6 +151,7 @@ async def _deploy_amf(ops_test: OpsTest):
AMF_CHARM_NAME,
application_name=AMF_CHARM_NAME,
channel=AMF_CHARM_CHANNEL,
series=SDCORE_CHARMS_SERIES, # TODO: This should be replaced with base="[email protected]" once it's properly supported # noqa: E501
trust=True,
)
await ops_test.model.integrate(relation1=AMF_CHARM_NAME, relation2=NRF_CHARM_NAME)
Expand Down

0 comments on commit 8513a9c

Please sign in to comment.