Skip to content

Commit

Permalink
vagrant-box atomic-host -> stream9
Browse files Browse the repository at this point in the history
Signed-off-by: Teoman ONAY <tonay@ibm.com>
(cherry picked from commit f1b67bd)

# Conflicts:
#	tests/functional/all-in-one/container/vagrant_variables.yml
#	tests/functional/all_daemons/container/vagrant_variables.yml
#	tests/functional/all_daemons_ipv6/container/vagrant_variables.yml
#	tests/functional/collocation/container/vagrant_variables.yml
#	tests/functional/external_clients/container/vagrant_variables.yml
#	tests/functional/shrink_mds/container/vagrant_variables.yml
#	tests/functional/shrink_mgr/container/vagrant_variables.yml
#	tests/functional/shrink_mon/container/vagrant_variables.yml
#	tests/functional/shrink_osd/container/vagrant_variables.yml
#	tests/functional/shrink_rbdmirror/container/vagrant_variables.yml
#	tests/functional/shrink_rgw/container/vagrant_variables.yml
#	tests/functional/subset_update/container/vagrant_variables.yml
  • Loading branch information
asm0deuz authored and mergify[bot] committed Jul 16, 2024
1 parent 69a9903 commit 0b9a1dc
Show file tree
Hide file tree
Showing 20 changed files with 68 additions and 8 deletions.
2 changes: 1 addition & 1 deletion tests/functional/add-mons/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/add-mons/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/all-in-one/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
# client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
# client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/all_daemons/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/collocation/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
# client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
# client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
# client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
# client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/lvm-batch/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/lvm-osds/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/podman/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cluster_subnet: 192.168.31
# set 1024 for CentOS
memory: 2048

vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
#vagrant_sync_dir: /home/vagrant/sync
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/rbdmirror/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host
vagrant_box: centos/stream9
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/shrink_mds/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/shrink_mgr/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/shrink_mon/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/shrink_osd/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/shrink_rgw/container/vagrant_variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
<<<<<<< HEAD
vagrant_box: centos/atomic-host
#client_vagrant_box: centos/stream8
=======
vagrant_box: centos/stream9
#client_vagrant_box: centos/stream9
>>>>>>> f1b67bd4d (vagrant-box atomic-host -> stream9)
#ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
Expand Down

0 comments on commit 0b9a1dc

Please sign in to comment.