From f41d359ebaec8762ed1a7b8cfd85c23f351a5070 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 8 Sep 2017 15:32:15 -0500 Subject: [PATCH] tests: remove 'ceph-' prefix from test node hostnames This updates our Vagrantfile to match the changes in ceph-ansible introduced by https://github.com/ceph/ceph-ansible/commit/298a63c43 Signed-off-by: Andrew Schoen --- .../ceph_volume/tests/functional/Vagrantfile | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/Vagrantfile index 4a7949573a9a8..469ca33906df3 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/Vagrantfile +++ b/src/ceph-volume/ceph_volume/tests/functional/Vagrantfile @@ -65,7 +65,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| (0..CLIENTS - 1).each do |i| config.vm.define "#{LABEL_PREFIX}client#{i}" do |client| client.vm.box = CLIENT_BOX - client.vm.hostname = "#{LABEL_PREFIX}ceph-client#{i}" + client.vm.hostname = "#{LABEL_PREFIX}client#{i}" if ASSIGN_STATIC_IP client.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.4#{i}" @@ -88,7 +88,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Parallels client.vm.provider "parallels" do |prl| - prl.name = "ceph-client#{i}" + prl.name = "client#{i}" prl.memory = "#{MEMORY}" end @@ -102,7 +102,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}rgw#{i}" do |rgw| rgw.vm.box = BOX rgw.vm.box_url = BOX_URL - rgw.vm.hostname = "#{LABEL_PREFIX}ceph-rgw#{i}" + rgw.vm.hostname = "#{LABEL_PREFIX}rgw#{i}" if ASSIGN_STATIC_IP rgw.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.5#{i}" @@ -126,7 +126,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Parallels rgw.vm.provider "parallels" do |prl| - prl.name = "ceph-rgw#{i}" + prl.name = "rgw#{i}" prl.memory = "#{MEMORY}" end @@ -140,7 +140,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "nfs#{i}" do |nfs| nfs.vm.box = BOX nfs.vm.box_url = BOX_URL - nfs.vm.hostname = "ceph-nfs#{i}" + nfs.vm.hostname = "nfs#{i}" if ASSIGN_STATIC_IP nfs.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.6#{i}" @@ -164,7 +164,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Parallels nfs.vm.provider "parallels" do |prl| - prl.name = "ceph-nfs#{i}" + prl.name = "nfs#{i}" prl.memory = "#{MEMORY}" end @@ -178,7 +178,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}mds#{i}" do |mds| mds.vm.box = BOX mds.vm.box_url = BOX_URL - mds.vm.hostname = "#{LABEL_PREFIX}ceph-mds#{i}" + mds.vm.hostname = "#{LABEL_PREFIX}mds#{i}" if ASSIGN_STATIC_IP mds.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.7#{i}" @@ -200,7 +200,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end # Parallels mds.vm.provider "parallels" do |prl| - prl.name = "ceph-mds#{i}" + prl.name = "mds#{i}" prl.memory = "#{MEMORY}" end @@ -214,7 +214,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}rbd_mirror#{i}" do |rbd_mirror| rbd_mirror.vm.box = BOX rbd_mirror.vm.box_url = BOX_URL - rbd_mirror.vm.hostname = "#{LABEL_PREFIX}ceph-rbd-mirror#{i}" + rbd_mirror.vm.hostname = "#{LABEL_PREFIX}rbd-mirror#{i}" if ASSIGN_STATIC_IP rbd_mirror.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.8#{i}" @@ -236,7 +236,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end # Parallels rbd_mirror.vm.provider "parallels" do |prl| - prl.name = "ceph-rbd-mirror#{i}" + prl.name = "rbd-mirror#{i}" prl.memory = "#{MEMORY}" end @@ -250,7 +250,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}iscsi_gw#{i}" do |iscsi_gw| iscsi_gw.vm.box = BOX iscsi_gw.vm.box_url = BOX_URL - iscsi_gw.vm.hostname = "#{LABEL_PREFIX}ceph-iscsi-gw#{i}" + iscsi_gw.vm.hostname = "#{LABEL_PREFIX}iscsi-gw#{i}" if ASSIGN_STATIC_IP iscsi_gw.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.9#{i}" @@ -272,7 +272,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end # Parallels iscsi_gw.vm.provider "parallels" do |prl| - prl.name = "ceph-iscsi-gw#{i}" + prl.name = "iscsi-gw#{i}" prl.memory = "#{MEMORY}" end @@ -286,7 +286,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}mon#{i}" do |mon| mon.vm.box = BOX mon.vm.box_url = BOX_URL - mon.vm.hostname = "#{LABEL_PREFIX}ceph-mon#{i}" + mon.vm.hostname = "#{LABEL_PREFIX}mon#{i}" if ASSIGN_STATIC_IP mon.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.1#{i}" @@ -309,7 +309,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Parallels mon.vm.provider "parallels" do |prl| - prl.name = "ceph-mon#{i}" + prl.name = "mon#{i}" prl.memory = "#{MEMORY}" end @@ -323,7 +323,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "#{LABEL_PREFIX}osd#{i}" do |osd| osd.vm.box = BOX osd.vm.box_url = BOX_URL - osd.vm.hostname = "#{LABEL_PREFIX}ceph-osd#{i}" + osd.vm.hostname = "#{LABEL_PREFIX}osd#{i}" if ASSIGN_STATIC_IP osd.vm.network :private_network, ip: "#{PUBLIC_SUBNET}.10#{i}" @@ -378,7 +378,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Parallels osd.vm.provider "parallels" do |prl| - prl.name = "ceph-osd#{i}" + prl.name = "osd#{i}" prl.memory = "#{MEMORY}" (0..1).each do |d| prl.customize ["set", :id, -- 2.39.5