From 280460c009239087517964efc5a10619f43474d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 6 Jun 2018 12:07:33 +0800 Subject: [PATCH] ceph-iscsi: rename group iscsi_gws MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 20c8065e48b6ea3027669bd5fa2f79779eac570a) --- Vagrantfile | 2 +- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- infrastructure-playbooks/purge-iscsi-gateways.yml | 2 +- infrastructure-playbooks/rolling_update.yml | 1 - roles/ceph-defaults/defaults/main.yml | 2 +- site.yml.sample | 4 ++-- .../centos/7/cluster/group_vars/{iscsi-gws => iscsigws} | 0 tests/functional/centos/7/cluster/hosts | 2 +- .../group_vars/iscsi_gws => docker/group_vars/iscsigws} | 1 + 10 files changed, 9 insertions(+), 9 deletions(-) rename tests/functional/centos/7/cluster/group_vars/{iscsi-gws => iscsigws} (100%) rename tests/functional/centos/7/{cluster/group_vars/iscsi_gws => docker/group_vars/iscsigws} (65%) diff --git a/Vagrantfile b/Vagrantfile index 24176edcf..d35049fa1 100644 --- 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 0f3262d60..7f7fb6b9b 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -51,7 +51,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 eb45c1bbf..d5777459f 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -51,7 +51,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 a773ba678..fa86d126e 100644 --- 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 7995e17c6..23396b27a 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -588,7 +588,6 @@ - ceph_nfs_enable_service - containerized_deployment - - name: upgrade ceph client node vars: diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 3e732042c..77e8f858a 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -43,7 +43,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.yml.sample b/site.yml.sample index 4904e512b..3a956faf1 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -12,7 +12,7 @@ - rbdmirrors - clients - mgrs - - iscsi-gws + - iscsigws gather_facts: false @@ -153,7 +153,7 @@ - ceph-config - ceph-client -- hosts: iscsi-gws +- hosts: iscsigws gather_facts: false become: True roles: diff --git a/tests/functional/centos/7/cluster/group_vars/iscsi-gws b/tests/functional/centos/7/cluster/group_vars/iscsigws similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/iscsi-gws rename to tests/functional/centos/7/cluster/group_vars/iscsigws diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts index 257f98aa8..2c73c9c0b 100644 --- a/tests/functional/centos/7/cluster/hosts +++ b/tests/functional/centos/7/cluster/hosts @@ -24,5 +24,5 @@ ceph-nfs0 [rbdmirrors] ceph-rbd-mirror0 -[iscsi-gws] +[iscsigws] ceph-iscsi-gw0 ceph_repository="dev" diff --git a/tests/functional/centos/7/cluster/group_vars/iscsi_gws b/tests/functional/centos/7/docker/group_vars/iscsigws similarity index 65% rename from tests/functional/centos/7/cluster/group_vars/iscsi_gws rename to tests/functional/centos/7/docker/group_vars/iscsigws index f08f50a87..401805eb3 100644 --- a/tests/functional/centos/7/cluster/group_vars/iscsi_gws +++ b/tests/functional/centos/7/docker/group_vars/iscsigws @@ -1,2 +1,3 @@ --- gateway_ip_list: 192.168.1.90 +generate_crt: True \ No newline at end of file -- 2.39.5