ceph-iscsi: rename group iscsi_gws

Let's try to avoid using dashes as testinfra needs to be able to read
the groups.
Typically, with iscsi-gws we can't add a marker for these iscsi nodes,
using an underscore fixes the issue.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/Vagrantfile b/Vagrantfile
index 5984042e5e9e758e3d06d96a751abb70b2770419..52d1a3eef145bfa8de3afe99dce1cde74e7d8b84 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -57,7 +57,7 @@ ansible_provision = proc do |ansible|
     'nfss'             => (0..NNFSS - 1).map { |j| "#{LABEL_PREFIX}nfs#{j}" },
     'rbd_mirrors'      => (0..NRBD_MIRRORS - 1).map { |j| "#{LABEL_PREFIX}rbd_mirror#{j}" },
     'clients'          => (0..CLIENTS - 1).map { |j| "#{LABEL_PREFIX}client#{j}" },
-    'iscsi_gws'        => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
+    'iscsigws'        => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
     'mgrs'             => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" }
   }
 

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index cbdd4b58e06551a613ea7fb49aaaa9b631976194..54f74328d745ac88fc47a0b8257eda4e63abdaf1 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -53,7 +53,7 @@ dummy:
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
-#iscsi_gw_group_name: iscsi-gws
+#iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 2a4ed9135f664e44b6fb32c2fde63bbf97ff37c9..6c3b07aafb04f850cbad6eb67958e8d5e4f3f6bb 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -53,7 +53,7 @@ fetch_directory: ~/ceph-ansible-keys
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
-#iscsi_gw_group_name: iscsi-gws
+#iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the

diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
index a773ba6789785aa7a4f19164bf31df925bdba7b9..fa86d126eb6bc0d65b0cd85e7538a5106c358b86 100644 (file)
--- a/infrastructure-playbooks/purge-iscsi-gateways.yml
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -20,7 +20,7 @@
         igw_purge_type: "{{ purge_config }}"
 
 - name: Removing the gateway configuration
-  hosts: iscsi-gws
+  hosts: iscsigws
   become: yes
   vars:
     - igw_purge_type: "{{hostvars['localhost']['igw_purge_type']}}"

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index a38671e5369deb4e8d82ef4e5d4ceadeb2926fd8..e18af14ee8518f1f817528d00810440a9aadbe16 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -652,7 +652,7 @@
     upgrade_ceph_packages: True
 
   hosts:
-    - "{{ iscsi_gw_group_name|default('iscsi-gws') }}"
+    - "{{ iscsi_gw_group_name|default('iscsigws') }}"
 
   serial: 1
   become: True

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index f71d42f62ec7bc78014c277e302b63870a777d43..3dd454e42739249a6bb1125d95bd3924d979ff33 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -45,7 +45,7 @@ nfs_group_name: nfss
 restapi_group_name: restapis
 rbdmirror_group_name: rbdmirrors
 client_group_name: clients
-iscsi_gw_group_name: iscsi-gws
+iscsi_gw_group_name: iscsigws
 mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index b36049438d85c0401e23be7f3ced455a2e80d2c3..5a2336986d084ca70bc14f7ccfe9dbfec8eb8fb5 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -114,7 +114,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
   roles:
     - role: ceph-defaults
-      tags: ['ceph_update_config'] 
+      tags: ['ceph_update_config']
     - role: ceph-docker-common
     - role: ceph-config
       tags: ['ceph_update_config']
@@ -327,7 +327,7 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsi-gws
+- hosts: iscsigws
   gather_facts: false
   become: True
   pre_tasks:

diff --git a/site.yml.sample b/site.yml.sample
index 691feb2c685ebec2b05b0b6deffb478ded5f4147..eb9c6460d1825e474065f94fb7fee289bfef4a59 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -12,7 +12,7 @@
   - rbdmirrors
   - clients
   - mgrs
-  - iscsi-gws
+  - iscsigws
 
   gather_facts: false
   any_errors_fatal: true
@@ -354,7 +354,7 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsi-gws
+- hosts: iscsigws
   gather_facts: false
   become: True
   pre_tasks:

diff --git a/tests/conftest.py b/tests/conftest.py
index a4a5660311fb01036be15d9f101f3af5c6d7dc75..bef7c7d5ad3fe1f1857720894077ebcda0873b27 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -52,8 +52,8 @@ def node(host, request):
     if node_type == "nfss" and ceph_stable_release == "jewel":
         pytest.skip("nfs nodes can not be tested with ceph release jewel")
 
-    if node_type == "iscsi_gws" and ceph_stable_release == "jewel":
-        pytest.skip("iscsi_gws nodes can not be tested with ceph release jewel")  # noqa E501
+    if node_type == "iscsigws" and ceph_stable_release == "jewel":
+        pytest.skip("iscsigws nodes can not be tested with ceph release jewel")  # noqa E501
 
     if request.node.get_marker("from_luminous") and ceph_release_num[ceph_stable_release] < ceph_release_num['luminous']:  # noqa E501
         pytest.skip(
@@ -137,7 +137,7 @@ def pytest_collection_modifyitems(session, config, items):
         elif "nfs" in test_path:
             item.add_marker(pytest.mark.nfss)
         elif "iscsi" in test_path:
-            item.add_marker(pytest.mark.iscsi_gws)
+            item.add_marker(pytest.mark.iscsigws)
         else:
             item.add_marker(pytest.mark.all)
 

diff --git a/tests/functional/centos/7/cluster/group_vars/iscsi-gws b/tests/functional/centos/7/cluster/group_vars/iscsi-gws
deleted file mode 100644 (file)
index f5b41fc..0000000
--- a/tests/functional/centos/7/cluster/group_vars/iscsi-gws
+++ /dev/null
@@ -1,3 +0,0 @@
----
-gateway_ip_list: 192.168.1.90
-generate_crt: True

diff --git a/tests/functional/centos/7/cluster/group_vars/iscsigws b/tests/functional/centos/7/cluster/group_vars/iscsigws
new file mode 100644 (file)
index 0000000..f5b41fc
--- /dev/null
+++ b/tests/functional/centos/7/cluster/group_vars/iscsigws
@@ -0,0 +1,3 @@
+---
+gateway_ip_list: 192.168.1.90
+generate_crt: True

diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 06c2eef384d13574c085901700273898a3fbf846..323a1d6492152156076aab9318aa07f991333385 100644 (file)
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -25,5 +25,5 @@ ceph-nfs0
 [rbdmirrors]
 ceph-rbd-mirror0
 
-[iscsi-gws]
+[iscsigws]
 ceph-iscsi-gw0 ceph_repository="dev"

diff --git a/tests/functional/centos/7/docker/group_vars/iscsi-gws b/tests/functional/centos/7/docker/group_vars/iscsi-gws
deleted file mode 100644 (file)
index f08f50a..0000000
--- a/tests/functional/centos/7/docker/group_vars/iscsi-gws
+++ /dev/null
@@ -1,2 +0,0 @@
----
-gateway_ip_list: 192.168.1.90

diff --git a/tests/functional/centos/7/docker/group_vars/iscsigws b/tests/functional/centos/7/docker/group_vars/iscsigws
new file mode 100644 (file)
index 0000000..401805e
--- /dev/null
+++ b/tests/functional/centos/7/docker/group_vars/iscsigws
@@ -0,0 +1,3 @@
+---
+gateway_ip_list: 192.168.1.90
+generate_crt: True
\ No newline at end of file

diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
index 4fc8d38f75d14ae4fd02ae910b9845b2c118b576..9365e5dd929a0c373ac7e3a139798dbee63f42c3 100644 (file)
--- a/tests/functional/centos/7/docker/hosts
+++ b/tests/functional/centos/7/docker/hosts
@@ -25,5 +25,5 @@ client1
 [rbdmirrors]
 rbd-mirror0
 
-[iscsi-gws]
+[iscsigws]
 iscsi-gw0