Skip to content

Install python-dnspython or python-dns to fix issue with cloudstack-setup-management#3854

Merged
yadvr merged 1 commit into
apache:4.13from
ustcweizhou:4.14-fix-dns.resolver
Feb 7, 2020
Merged

Install python-dnspython or python-dns to fix issue with cloudstack-setup-management#3854
yadvr merged 1 commit into
apache:4.13from
ustcweizhou:4.14-fix-dns.resolver

Conversation

@ustcweizhou

Copy link
Copy Markdown
Contributor

Description

Fixes #3817 #3841

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)

Screenshots (if appropriate):

How Has This Been Tested?

@GabrielBrascher GabrielBrascher added this to the 4.14.0.0 milestone Jan 30, 2020
@DaanHoogland

Copy link
Copy Markdown
Contributor

lgtm, but i think we want this on 4.13

@yadvr
yadvr changed the base branch from master to 4.13 January 30, 2020 16:36
@yadvr
yadvr changed the base branch from 4.13 to master January 30, 2020 16:37
@weizhouapache

Copy link
Copy Markdown
Member

lgtm, but i think we want this on 4.13

yes, we do need.
After this get merged, I will create another PR , so we do not need to avoid review twice.

@GabrielBrascher

Copy link
Copy Markdown
Member

@DaanHoogland @ustcweizhou it might be easier to target this one into 4.13 and then forward it to 4.14, instead of opening two PRs. What do you think of targeting this PR to 4.13?

@DaanHoogland

Copy link
Copy Markdown
Contributor

I agree with @GabrielBrascher , @weizhouapache. i've been forward merging all 4.13 PRs so far, so we only review once.

@weizhouapache

weizhouapache commented Jan 31, 2020

Copy link
Copy Markdown
Member

@DaanHoogland @GabrielBrascher
I understand your concerns.
due to #3371 which only exist in master not 4.13, there are some conflicts when forward merge 4.13 to master if this PR is merged into 4.13

@DaanHoogland can you cherry pick #3371 from master to 4.13 ?

@DaanHoogland

Copy link
Copy Markdown
Contributor

ohw, that is a revert and a revert of a revert... will have a look @weizhouapache , but you might be right.

@DaanHoogland

Copy link
Copy Markdown
Contributor

the conflict are the deps 'gawk, iproute2', I have no idea if these are needed in 4.13. Need to look so procrastinating....

@weizhouapache

Copy link
Copy Markdown
Member

the conflict are the deps 'gawk, iproute2', I have no idea if these are needed in 4.13. Need to look so procrastinating....

oh, yes, this commit e93f6bf only exist in master

@DaanHoogland

DaanHoogland commented Jan 31, 2020

Copy link
Copy Markdown
Contributor

tnx @weizhouapache. @rhtyd @GabrielBrascher I can cherry pick both those commits without conflicts: e93f6bf and a0efbf9 . Shall we and than ask @weizhouapache to base this on 4.13 and run regression?
/cc @andrijapanicsb

@svenvogel

Copy link
Copy Markdown
Contributor

@DaanHoogland a0efbf9 and e93f6bf <- does this has an affect on the current PR or do you want to cherry pick it for dependency?

@yadvr

yadvr commented Jan 31, 2020

Copy link
Copy Markdown
Member

@ustcweizhou can you simply close this and open a PR against 4.13 including the changes to add/support gawk and iproute2 dependencies?

@yadvr

yadvr commented Feb 5, 2020

Copy link
Copy Markdown
Member

Ping @ustcweizhou ?

@ustcweizhou
ustcweizhou force-pushed the 4.14-fix-dns.resolver branch from 2b454a6 to dd7bf79 Compare February 5, 2020 08:44
@weizhouapache
weizhouapache changed the base branch from master to 4.13 February 5, 2020 08:44
@weizhouapache weizhouapache reopened this Feb 5, 2020
@weizhouapache

Copy link
Copy Markdown
Member

rebased with 4.13 instead of master

@yadvr yadvr modified the milestones: 4.14.0.0, 4.13.1.0 Feb 5, 2020
@yadvr

yadvr commented Feb 5, 2020

Copy link
Copy Markdown
Member

@ustcweizhou can you also check in 4.13, the changes in centos6's spec?
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-750

@weizhouapache

Copy link
Copy Markdown
Member

@ustcweizhou can you also check in 4.13, the changes in centos6's spec?
@blueorangutan package

@rhtyd do we still support centos6 ? I do not have a centos6 env

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-754

@yadvr

yadvr commented Feb 6, 2020

Copy link
Copy Markdown
Member

@ustcweizhou in master/4.14 we won't but in 4.13 we still support centos6 (see packaging/centos63/ in your 4.13 branch)

@weizhouapache

Copy link
Copy Markdown
Member

@rhtyd
python-pip and python-dns are part of EPEL for centos6
I would suggest to add the fix in cloudstack document

sudo yum install epel-release
sudo yum -y install python-dns

@yadvr

yadvr commented Feb 6, 2020

Copy link
Copy Markdown
Member

@DaanHoogland

Copy link
Copy Markdown
Contributor

@rhtyd @weizhouapache are we merging this as is?

@weizhouapache

Copy link
Copy Markdown
Member

@rhtyd @weizhouapache are we merging this as is?

I am ok with it.
but you know, I am the author of this PR .....

@yadvr

yadvr commented Feb 7, 2020

Copy link
Copy Markdown
Member

I'm okay with doc notes. @ustcweizhou please send a PR to apache/cloudstack-documentation or @andrijapanicsb please keep a note. Thanks.

@yadvr

yadvr commented Feb 7, 2020

Copy link
Copy Markdown
Member

Checked the centos7 dependencies names are correct, packaging is OK. Explicit smoketests are not necessary.

@yadvr
yadvr merged commit 4d0c6b7 into apache:4.13 Feb 7, 2020
yadvr added a commit that referenced this pull request Feb 7, 2020
…loudstack-setup-management (#3854) (#3869)

Fixes #3817 #3841

Co-authored-by: Wei Zhou <ustcweizhou@gmail.com>
yadvr pushed a commit that referenced this pull request Feb 7, 2020
…loudstack-setup-management (#3854)

Fixes #3817 #3841

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
ustcweizhou added a commit to ustcweizhou/cloudstack that referenced this pull request Feb 28, 2020
…loudstack-setup-management (apache#3854) (apache#3869)

Fixes apache#3817 apache#3841

Co-authored-by: Wei Zhou <ustcweizhou@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cloudstack 4.13v unable to start management server

7 participants