Skip to content

VR: fix data-server if shared network has multiple ip ranges - #5530

Merged
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:4.15-fix-etc-hosts-in-vr
Oct 4, 2021
Merged

VR: fix data-server if shared network has multiple ip ranges#5530
DaanHoogland merged 3 commits into
apache:mainfrom
shapeblue:4.15-fix-etc-hosts-in-vr

Conversation

@weizhouapache

@weizhouapache weizhouapache commented Sep 29, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Description

This PR fixes #5518

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@weizhouapache

weizhouapache commented Sep 29, 2021

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

blueorangutan commented Sep 29, 2021

Copy link
Copy Markdown

@weizhouapache a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

blueorangutan commented Sep 29, 2021

Copy link
Copy Markdown

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 1441

@weizhouapache

weizhouapache commented Sep 29, 2021

Copy link
Copy Markdown
Member Author

@blueorangutan test

@weizhouapache weizhouapache added this to the 4.16.0.0 milestone Sep 29, 2021
@blueorangutan

blueorangutan commented Sep 29, 2021

Copy link
Copy Markdown

@weizhouapache a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

blueorangutan commented Sep 29, 2021

Copy link
Copy Markdown

Trillian test result (tid-2237)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31468 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5530-t2237-kvm-centos7.zip
Smoke tests completed. 87 look OK, 0 have errors
Only failed tests results shown below:

Test Result Time (s) Test File

@sureshanaparti

sureshanaparti commented Sep 30, 2021

Copy link
Copy Markdown
Contributor

@weizhouapache can you re-target to 'main' please.

@weizhouapache
weizhouapache changed the base branch from 4.15 to main September 30, 2021 07:27
@weizhouapache

weizhouapache commented Sep 30, 2021

Copy link
Copy Markdown
Member Author

@weizhouapache can you re-target to 'main' please.

@sureshanaparti done.

@weizhouapache
Update PR apache#5530: fix nameserver in vm with IP in additional IP …
f381486 
…ranges

without this change
```
root@r-757-VM:~# cat /etc/dnsmasq.d/cloud.conf
listen-address=127.0.0.1,10.10.12.31,10.10.13.19
dhcp-range=set:interface-eth0-0,10.10.12.31,static
dhcp-option=tag:interface-eth0-0,15,cs1cloud.internal
dhcp-option=tag:interface-eth0-0,6,10.10.12.31,10.0.32.1,8.8.8.8
dhcp-option=tag:interface-eth0-0,3,10.10.12.254
dhcp-option=tag:interface-eth0-0,1,255.255.255.0
dhcp-range=set:interface-eth0-1,10.10.13.19,static
dhcp-option=tag:interface-eth0-1,15,cs1cloud.internal
dhcp-option=tag:interface-eth0-1,6,10.10.12.31,10.0.32.1,8.8.8.8 <<< nameserver 10.10.12.31
dhcp-option=tag:interface-eth0-1,3,10.10.13.254
dhcp-option=tag:interface-eth0-1,1,255.255.255.0
```

with this change
```
root@r-757-VM:~# cat /etc/dnsmasq.d/cloud.conf
listen-address=127.0.0.1,10.10.12.31,10.10.13.19
dhcp-range=set:interface-eth0-0,10.10.12.31,static
dhcp-option=tag:interface-eth0-0,15,cs1cloud.internal
dhcp-option=tag:interface-eth0-0,6,10.10.12.31,10.0.32.1,8.8.8.8
dhcp-option=tag:interface-eth0-0,3,10.10.12.254
dhcp-option=tag:interface-eth0-0,1,255.255.255.0
dhcp-range=set:interface-eth0-1,10.10.13.19,static
dhcp-option=tag:interface-eth0-1,15,cs1cloud.internal
dhcp-option=tag:interface-eth0-1,6,10.10.13.19,10.0.32.1,8.8.8.8 <<< nameserver 10.10.13.19
dhcp-option=tag:interface-eth0-1,3,10.10.13.254
dhcp-option=tag:interface-eth0-1,1,255.255.255.0
```
@weizhouapache
Update apache#5530: add 'localise-queries' to /etc/dnsmasq.conf
f521ab9
@weizhouapache
weizhouapache marked this pull request as ready for review September 30, 2021 07:52
@weizhouapache

weizhouapache commented Sep 30, 2021

Copy link
Copy Markdown
Member Author

@blueorangutan package

@weizhouapache

weizhouapache commented Sep 30, 2021

Copy link
Copy Markdown
Member Author

@nvazquez @sureshanaparti
this is ready for review and test

@sureshanaparti

sureshanaparti commented Oct 1, 2021

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

blueorangutan commented Oct 1, 2021

Copy link
Copy Markdown

@sureshanaparti a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

blueorangutan commented Oct 1, 2021

Copy link
Copy Markdown

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 1466

@weizhouapache

weizhouapache commented Oct 1, 2021

Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan

blueorangutan commented Oct 1, 2021

Copy link
Copy Markdown

@weizhouapache a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

blueorangutan commented Oct 1, 2021

Copy link
Copy Markdown

Trillian test result (tid-2266)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33733 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5530-t2266-kvm-centos7.zip
Smoke tests completed. 90 look OK, 0 have errors
Only failed tests results shown below:

Test Result Time (s) Test File

@yadvr

yadvr commented Oct 3, 2021

Copy link
Copy Markdown
Member

This may needs some checking/testing, not merging this myself cc @nvazquez

@DaanHoogland DaanHoogland self-assigned this Oct 4, 2021
DaanHoogland
DaanHoogland approved these changes Oct 4, 2021
View reviewed changes

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

tested
two small ranges in a shared net 10.11.12.10-12 and 10.11.13.10-12. After creating a fourth VM, including VR/dataserver, passwords are still handed out:
image

@DaanHoogland
DaanHoogland merged commit 9f5ac89 into apache:main Oct 4, 2021
@weizhouapache
weizhouapache deleted the 4.15-fix-etc-hosts-in-vr branch December 9, 2022 08:45
@DaanHoogland DaanHoogland removed their assignment Jun 13, 2023
@weizhouapache weizhouapache mentioned this pull request Jan 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes
@DaanHoogland DaanHoogland DaanHoogland approved these changes
@sureshanaparti sureshanaparti sureshanaparti approved these changes
@nvazquez nvazquez Awaiting requested review from nvazquez

Assignees

No one assigned

Labels

component:virtual-router type:bug

Projects

None yet

Milestone

4.16.0.0

Development

Successfully merging this pull request may close these issues.

data-server IP provided to the cloud-init if not from the same subnet

6 participants

@weizhouapache @blueorangutan @sureshanaparti @yadvr @DaanHoogland @nvazquez