ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2001 from ceph/iscsi 

iscsi: fix wrong group name for iscsi
pull/2004/head
Sébastien Han 2017-10-05 18:29:06 +02:00 committed by GitHub
parent 530bf5d134 b6b24a5ca9
commit 0d833657c1
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -51,7 +51,7 @@ dummy:
#restapi_group_name: restapis #restapi_group_name: restapis
#rbdmirror_group_name: rbdmirrors #rbdmirror_group_name: rbdmirrors
#client_group_name: clients #client_group_name: clients
#iscsi_gw_group_name: iscsi_gws #iscsi_gw_group_name: iscsi-gws
#mgr_group_name: mgrs #mgr_group_name: mgrs
# If check_firewall is true, then ansible will try to determine if the # If check_firewall is true, then ansible will try to determine if the

2
group_vars/rhcs.yml.sample
View File

@ -51,7 +51,7 @@ fetch_directory: ~/ceph-ansible-keys
#restapi_group_name: restapis #restapi_group_name: restapis
#rbdmirror_group_name: rbdmirrors #rbdmirror_group_name: rbdmirrors
#client_group_name: clients #client_group_name: clients
#iscsi_gw_group_name: iscsi_gws #iscsi_gw_group_name: iscsi-gws
#mgr_group_name: mgrs #mgr_group_name: mgrs
# If check_firewall is true, then ansible will try to determine if the # If check_firewall is true, then ansible will try to determine if the

2
infrastructure-playbooks/purge-cluster.yml
View File

@ -509,7 +509,7 @@
igw_purge_type: all igw_purge_type: all
hosts: hosts:
- "{{ iscsi_gw_group_name|default('iscsi-gw') }}" - "{{ iscsi_gw_group_name|default('iscsi-gws') }}"
gather_facts: false # already gathered previously gather_facts: false # already gathered previously

2
roles/ceph-defaults/defaults/main.yml
View File

@ -43,7 +43,7 @@ nfs_group_name: nfss
restapi_group_name: restapis restapi_group_name: restapis
rbdmirror_group_name: rbdmirrors rbdmirror_group_name: rbdmirrors
client_group_name: clients client_group_name: clients
iscsi_gw_group_name: iscsi_gws iscsi_gw_group_name: iscsi-gws
mgr_group_name: mgrs mgr_group_name: mgrs
# If check_firewall is true, then ansible will try to determine if the # If check_firewall is true, then ansible will try to determine if the

6
roles/ceph-iscsi-gw/tasks/generate_crt.yml
View File

@ -1,16 +1,16 @@
--- ---
- name: (local) create ssl crt/key files - name: create ssl crt/key files
shell: | shell: |
openssl req -newkey rsa:2048 -nodes -keyout /etc/ceph/iscsi-gateway.key -x509 -days 365 -out /etc/ceph/iscsi-gateway.crt -subj "/C=US/ST=./L=./O=RedHat/OU=Linux/CN={{ ansible_hostname }}" openssl req -newkey rsa:2048 -nodes -keyout /etc/ceph/iscsi-gateway.key -x509 -days 365 -out /etc/ceph/iscsi-gateway.crt -subj "/C=US/ST=./L=./O=RedHat/OU=Linux/CN={{ ansible_hostname }}"
run_once: True run_once: True
- name: (local) create pem - name: create pem
shell: | shell: |
cat /etc/ceph/iscsi-gateway.crt /etc/ceph/iscsi-gateway.key > /etc/ceph/iscsi-gateway.pem cat /etc/ceph/iscsi-gateway.crt /etc/ceph/iscsi-gateway.key > /etc/ceph/iscsi-gateway.pem
run_once: True run_once: True
register: pem register: pem
- name: (local) create public key from pem - name: create public key from pem
shell: | shell: |
openssl x509 -inform pem -in /etc/ceph/iscsi-gateway.pem -pubkey -noout > /etc/ceph/iscsi-gateway-pub.key openssl x509 -inform pem -in /etc/ceph/iscsi-gateway.pem -pubkey -noout > /etc/ceph/iscsi-gateway-pub.key
run_once: True run_once: True

4
site.yml.sample
View File

@ -12,7 +12,7 @@
- rbdmirrors - rbdmirrors
- clients - clients
- mgrs - mgrs
- iscsi_gws - iscsi-gws
gather_facts: false gather_facts: false
@ -142,7 +142,7 @@
- ceph-config - ceph-config
- ceph-client - ceph-client
- hosts: iscsi_gws - hosts: iscsi-gws
gather_facts: false gather_facts: false
become: True become: True
roles: roles:

2
tests/functional/centos/7/cluster/group_vars/iscsi-gws 100644
View File

@ -0,0 +1,2 @@
---
gateway_ip_list: 192.168.1.90

2
tests/functional/centos/7/cluster/hosts
View File

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