Skip to content

Commit

Permalink
fixup! Add option to specify external net via ID
Browse files Browse the repository at this point in the history 
Signed-off-by: Roman Hros <roman.hros@dnation.cloud>
  • Loading branch information
@chess-knight @jschoone
chess-knight authored and jschoone committed Oct 6, 2023
1 parent 511e9a0 commit 0f4115a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
14 changes: 7 additions & 7 deletions doc/configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ Parameters controlling the Cluster-API management server (capi management server

Parameters controlling both management server creation and cluster creation:

| environment | clusterctl.yaml | provenance | default | meaning |
|--------------------------|---------------------------------|------------|--------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|
| `cloud_provider` | `OPENSTACK_CLOUD` | capo | | `OS_CLOUD` name in clouds.yaml |
| `external`/`external_id` | `OPENSTACK_EXTERNAL_NETWORK_ID` | capo | `""` | Name/ID of the external (public) OpenStack network, default "" uses the detected external network (for clouds with one external network) |
| `dns_nameservers` | `OPENSTACK_DNS_NAMESERVERS` | capo | `[ "5.1.66.255", "185.150.99.255" ]` | Array of nameservers for capi mgmt server and for cluster nodes, replace the FF MUC defaults with local servers if available |
| `availability_zone` | `OPENSTACK_FAILURE_DOMAIN` | capo | | Availability Zone(s) for the mgmt node / workload clusters |
| `kind_mtu` | `MTU_VALUE` | SCS | `0` | MTU for the mgmt server; Calico is set 50 bytes smaller; 0 means autodetection |
| environment | clusterctl.yaml | provenance | default | meaning |
|--------------------------|---------------------------------|------------|--------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `cloud_provider` | `OPENSTACK_CLOUD` | capo | | `OS_CLOUD` name in clouds.yaml |
| `external`/`external_id` | `OPENSTACK_EXTERNAL_NETWORK_ID` | capo | `""` | Name/ID of the external (public) OpenStack network, default "" uses the detected external network (for clouds with one external network). Required for clouds with more than one external network |
| `dns_nameservers` | `OPENSTACK_DNS_NAMESERVERS` | capo | `[ "5.1.66.255", "185.150.99.255" ]` | Array of nameservers for capi mgmt server and for cluster nodes, replace the FF MUC defaults with local servers if available |
| `availability_zone` | `OPENSTACK_FAILURE_DOMAIN` | capo | | Availability Zone(s) for the mgmt node / workload clusters |
| `kind_mtu` | `MTU_VALUE` | SCS | `0` | MTU for the mgmt server; Calico is set 50 bytes smaller; 0 means autodetection |

### Parameters clusters

Expand Down
6 changes: 5 additions & 1 deletion terraform/neutron.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,14 @@ resource "openstack_networking_subnet_v2" "subnet_mgmt" {
}
}

data "openstack_networking_network_v2" "external" {
name = data.openstack_networking_network_v2.extnet.name
}

resource "openstack_networking_router_v2" "router_mgmt" {
name = "${var.prefix}-rtr"
description = "router for mgmtcluster (managed by terraform)"
external_network_id = data.openstack_networking_network_v2.extnet.id
external_network_id = data.openstack_networking_network_v2.external.id
availability_zone_hints = [var.availability_zone] # comment this out if your cloud does not have network AZs
}

Expand Down

0 comments on commit 0f4115a

Please sign in to comment.