-
Notifications
You must be signed in to change notification settings - Fork 103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tunnel related improvements #949
base: main
Are you sure you want to change the base?
Conversation
In the `openstack_deploy_prep` target we are setting `CTLPLANE_IP_ADDRESS_PREFIX` to `NNCP_CTLPLANE_IPV6_ADDRESS_PREFIX`, which isn't correct because we are assigning an IPv6 prefix to an IPv4 prefix variable. This patch changes it to use the right prefix `NNCP_CTLPLANE_IP_ADDRESS_PREFIX`.
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/a1b8beb9e29c49d3920e1cbb1547cd68 ✔️ openstack-k8s-operators-content-provider SUCCESS in 4h 33m 48s |
recheck |
Current `edpm_deploy_prep` target only allows to change the dataplane kustomize scenario within those provided by the openstack operator, but we may want to provide our own. This patch introduces a way to change the samples dir with a custom one using the `DATAPLANE_SAMPLES_DIR` variable, which would still use the `DATAPLANE_KUSTOMIZE_SCENARIO` variable to form the full location. It also introduces a way to set the full path to the scenario ignoring the scenario variable using variable `DATAPLANE_KUSTOMIZE_DIR`.
When using the `attach_default_interface_cleanup` target of devsetup on a system where the CRC VM is no longer present it will fail to remove the static DHCP entry from the libvirt network. This patch makes the `interfaces-setup-cleanup.sh` script more robust as it will now remove the static entry even when the VM is gone (using the static IP address assigned).
This patch introduces a mechanism to run an arbitrary script on the `edpm_deploy_prep` target after the `kustomization.yaml` file has been created by the `gen-edpm-kustomize.sh` script. This provides a flexible mechanism to modify things in the kustomization that are not currently possible. An example is to use a different ansible host for deployment than the IP that will be used as the `ctlplane` network IP. The variable used to define the location of the script is `EDPM_POST_GEN_SCRIPT`. Example of usage: ``` $ make edpm_deploy \ DATAPLANE_POST_GEN_SCRIPT="$(realpath ./scripts/change-ansible-hosts.sh)" ``` And the contents of `change-ansible-hosts.sh` are: ``` sed -i "s/value: 192.168.122.100/value: 192.168.1.13/" kustomization.yaml ```
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/0d3f815f5ef94a2e885693cbc1068d19 ✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 32m 46s |
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/b84dbd9c84ed45e18ab98857ca2eea55 ✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 29m 28s |
If we don't set the VLANs MTUs in the NNCP we will always get a default value and not a value based on the bridge like it should. With this patch we allow setting the VLAN MTU specifically for the OCP cluster. This is necessary when the underlying interface is a tunnel and not a physical NIC. By default it will be set to the same value as the network mtu.
Currently we always try to setup the RDO repo, but if we run the script on a RHEL repo it will fail to find the URL. With this patch we allow not setting up the repository.
With this patch we'll be able to allow using the default values for `registry_url`, `image_prefix` and `image_tag` when the values for their corresponding variables are empty.
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Akrog The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/8002e7b6473f4fc2a4931d2a102235f6 ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 39m 20s |
In this PR I'm adding some fixes and features helpful for a PoC I'm working on where we connect a remote edpm node using tunnel.
Changes are as follow:
openstack_deploy_prep
target that is settingCTLPLANE_IP_ADDRESS_PREFIX
to an IPv6 prefix.edpm_deploy_prep
target.More information on these changes is available on the respective patches commit message.