Skip to content

Minor ipv6-nat64 fixes #1020

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor ipv6-nat64 fixes #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions devsetup/scripts/ipv6-nat64/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Network setup relies on `systemd-resolved` service enabled and used for DNS
resolution. If it's not installed on your machine (for example, if you use
RHEL), then:

#. Install the package: `dnf install -y systemd-resolved`
#. Enable and start the service: `systemctl enable --now systemd-resolved`
#. Configure it as the default resolver for the system: `ln -sf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`
#. Install the package: `sudo dnf install -y systemd-resolved`
#. Enable and start the service: `sudo systemctl enable --now systemd-resolved`
#. Configure it as the default resolver for the system: `sudo ln -sf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`

Further DNS requests initiated by the hypervisor should now go through the stub `systemd-resolved` resolver.

Expand Down
2 changes: 1 addition & 1 deletion devsetup/scripts/ipv6-nat64/network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function build_dnsmasq {
make
make install PREFIX=${WORK_DIR}
# Set selinux context to bin_t
sudo chcon -t bin_t ${WORK_DIR}/sbin/dnsmasq
sudo chcon -h system_u:object_r:bin_t:s0 ${WORK_DIR}/sbin/dnsmasq
popd

popd
Expand Down
6 changes: 3 additions & 3 deletions devsetup/scripts/ipv6-nat64/sno.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ ARCH="${ARCH:-x86_64}"
MEMORY="${MEMORY:-32768}"
VCPUS="${VCPUS:-12}"
OS_VARIANT="${OS_VARIANT:-fedora-coreos-stable}"
DISK_SIZE="${DISK_SIZE:-150}"
DISK_SIZE="${DISK_SIZE:-31}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this possibly going to cause issues for some CI jobs since we use local-storage? Or do we think 31GB should be sufficient for all of our jobs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just want to align this with CRC. Jobs will be overriding this value for their requirements where necessary

VIRT_TYPE="${VIRT_TYPE:-kvm}"
NET_MODEL="${NET_MODEL:-virtio}"
# Libvirt config
Expand All @@ -94,7 +94,7 @@ fi

mkdir -p "${WORK_DIR}"/ocp
mkdir -p "${WORK_DIR}"/bin
sudo chcon -t bin_t ${WORK_DIR}/bin
sudo chcon -h system_u:object_r:bin_t:s0 ${WORK_DIR}/bin

function get_oc_client {
pushd ${WORK_DIR}
Expand Down Expand Up @@ -230,7 +230,7 @@ host-record=api.sno.lab.example.com,${SNO_HOST_IP}
host-record=api-int.sno.lab.example.com,${SNO_HOST_IP}
dhcp-host=${SNO_HOST_MAC},[${SNO_HOST_IP}],2m
EOF
mkdir -p ${NAT64_IPV6_DNSMASQ_CONF_DIR}/conf.d
sudo mkdir -p ${NAT64_IPV6_DNSMASQ_CONF_DIR}/conf.d
sudo cp -v ${MY_TMP_DIR}/sno.conf ${NAT64_IPV6_DNSMASQ_CONF_DIR}/conf.d/sno.conf
sudo systemctl restart ${NAT64_IPV6_DNSMASQ_SERVICE_NAME}
}
Expand Down