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>
pull/2740/head
Sébastien Han 2018-06-06 12:07:33 +08:00 committed by Guillaume Abrioux
parent c00fb12497
commit 20c8065e48
13 changed files with 16 additions and 15 deletions

2
Vagrantfile vendored
View File

@ -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}" }
}

View File

@ -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

View File

@ -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

View File

@ -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']}}"

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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)

View File

@ -25,5 +25,5 @@ ceph-nfs0
[rbdmirrors]
ceph-rbd-mirror0
[iscsi-gws]
[iscsigws]
ceph-iscsi-gw0 ceph_repository="dev"

View File

@ -1,2 +1,3 @@
---
gateway_ip_list: 192.168.1.90
generate_crt: True

View File

@ -25,5 +25,5 @@ client1
[rbdmirrors]
rbd-mirror0
[iscsi-gws]
[iscsigws]
iscsi-gw0