Skip to content
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

Add libvirt ipv6 support scenario in vagrant (backport #7434) #7437

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 28, 2023

This is an automatic backport of pull request #7434 done by Mergify.
Cherry-pick of 8f3bdd8 has failed:

On branch mergify/bp/stable-7.0/pr-7434
Your branch is up to date with 'origin/stable-7.0'.

You are currently cherry-picking commit 8f3bdd855.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Vagrantfile
	modified:   roles/ceph-facts/tasks/grafana.yml
	new file:   tests/functional/all_daemons_ipv6/Vagrantfile
	new file:   tests/functional/all_daemons_ipv6/ceph-override.json
	new file:   tests/functional/all_daemons_ipv6/container/Vagrantfile
	new file:   tests/functional/all_daemons_ipv6/container/ceph-override.json
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/all
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/clients
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/iscsigws
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/mons
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/osds
	new file:   tests/functional/all_daemons_ipv6/container/group_vars/rgws
	new file:   tests/functional/all_daemons_ipv6/container/hosts
	new file:   tests/functional/all_daemons_ipv6/container/vagrant_variables.yml
	new file:   tests/functional/all_daemons_ipv6/group_vars/all
	new file:   tests/functional/all_daemons_ipv6/group_vars/clients
	new file:   tests/functional/all_daemons_ipv6/group_vars/iscsigws
	new file:   tests/functional/all_daemons_ipv6/group_vars/mons
	new file:   tests/functional/all_daemons_ipv6/group_vars/nfss
	new file:   tests/functional/all_daemons_ipv6/group_vars/osds
	new file:   tests/functional/all_daemons_ipv6/group_vars/rgws
	new file:   tests/functional/all_daemons_ipv6/hosts
	new file:   tests/functional/all_daemons_ipv6/vagrant_variables.yml
	modified:   tests/requirements.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tox.ini

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jun 28, 2023
Addition of ipv6 support in vagrant/libvirt and an all_daemons_ipv6 scenario.
Some typo fixes

Signed-off-by: Teoman ONAY <tonay@ibm.com>
(cherry picked from commit 8f3bdd8)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7434 branch from 671209e to a8dad72 Compare June 29, 2023 09:33
@asm0deuz asm0deuz merged commit 91c57b6 into stable-7.0 Jun 29, 2023
5 checks passed
@asm0deuz asm0deuz deleted the mergify/bp/stable-7.0/pr-7434 branch June 29, 2023 13:02
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.

1 participant