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

Remove rgw installation from the ceph-rgw role 

The installation of rgw is now handled by the ceph-common role.
Fixes: #307

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/364/head
Sébastien Han 2015-08-03 17:39:57 +02:00
parent ab76578a51
commit 7ed67f37d8
19 changed files with 66 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/all.sample
View File

@ -171,6 +171,12 @@ dummy:
#radosgw_keystone_revocation_internal: 900
#radosgw_s3_auth_use_keystone: "true"
#radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss
# Toggle 100-continue support for Apache and FastCGI
# WARNING: Changing this value will cause an outage of Apache while it is reinstalled on RGW nodes
#http_100_continue: false
# Rados Gateway options
#redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
#email_address: foo@bar.com
## REST API options
#

10
group_vars/rgws.sample
View File

@ -10,16 +10,6 @@ dummy:
# allowing root to not require tty
#radosgw_user: root
# Toggle 100-continue support for Apache and FastCGI
# WARNING: Changing this value will cause an outage of Apache while it is reinstalled on RGW nodes
#http_100_continue: false
# Rados Gateway options
#redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
#email_address: foo@bar.com
#radosgw_frontend: civetweb # we currently only support a single backend
##########
# DOCKER #
##########

6
roles/ceph-common/defaults/main.yml
View File

@ -179,6 +179,12 @@ radosgw_keystone_token_cache_size: 10000
radosgw_keystone_revocation_internal: 900
radosgw_s3_auth_use_keystone: "true"
radosgw_nss_db_path: /var/lib/ceph/radosgw/ceph-radosgw.{{ ansible_hostname }}/nss
# Toggle 100-continue support for Apache and FastCGI
# WARNING: Changing this value will cause an outage of Apache while it is reinstalled on RGW nodes
http_100_continue: false
# Rados Gateway options
redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
email_address: foo@bar.com
## REST API options
#

18
roles/ceph-common/handlers/main.yml
View File

@ -64,3 +64,21 @@
socketrgw.rc == 0 and
ansible_os_family == 'RedHat' and
rgw_group_name in group_names
- name: restart apache2
service: >
name=apache2
state=restarted
enabled=yes
when:
ansible_os_family == 'Debian' and
rgw_group_name in group_names
- name: restart apache2
service: >
name=httpd
state=restarted
enabled=yes
when:
ansible_os_family == 'RedHat' and
rgw_group_name in group_names

8
roles/ceph-common/tasks/installs/install_on_debian.yml
View File

@ -61,6 +61,14 @@
- ceph-mds #|--> they don't get update so we need to force them
- libcephfs1 #|
- name: install rados gateway
apt: >
pkg=radosgw
state=present
update_cache=yes
when:
rgw_group_name in group_names
- name: configure rbd clients directories
file: >
path={{ item }}

7
roles/ceph-common/tasks/installs/install_on_redhat.yml
View File

@ -102,6 +102,13 @@
- "{{ ceph_stable_ice_temp_path }}/kmod-rbd-{{ ceph_stable_ice_kmod }}.rpm"
when: ceph_stable_ice
- name: install rados gateway
yum: >
name=ceph-radosgw
state=present
when:
rgw_group_name in group_names
- name: configure rbd clients directories
file: >
path={{ item }}

0
roles/ceph-rgw/tasks/installs/install_debian.yml → roles/ceph-common/tasks/installs/install_rgw_on_debian.yml
View File

0
roles/ceph-rgw/tasks/installs/install_redhat.yml → roles/ceph-common/tasks/installs/install_rgw_on_redhat.yml
View File

14
roles/ceph-common/tasks/main.yml
View File

@ -25,6 +25,18 @@
- include: ./installs/install_on_debian.yml
when: ansible_os_family == 'Debian'
- include: ./installs/install_rgw_on_redhat.yml
when:
ansible_os_family == 'RedHat' and
radosgw_frontend == 'apache' and
rgw_group_name in group_names
- include: ./installs/install_rgw_on_debian.yml
when:
ansible_os_family == 'Debian' and
radosgw_frontend == 'apache' and
rgw_group_name in group_names
- name: check for a ceph socket
shell: "stat /var/run/ceph/*.asok > /dev/null 2>&1"
changed_when: false
@ -38,7 +50,7 @@
register: socketrgw
- name: create a local fetch directory if it doesn't exist
local_action: file path=fetch state=directory
local_action: file path=fetch state=directory
changed_when: false
sudo: false

0
roles/ceph-rgw/templates/ceph-extra.repo → roles/ceph-common/templates/ceph-extra.repo
View File

0
roles/ceph-rgw/templates/ceph.j2 → roles/ceph-common/templates/ceph.j2
View File

0
roles/ceph-rgw/templates/httpd.conf → roles/ceph-common/templates/httpd.conf
View File

0
roles/ceph-rgw/templates/rgw.conf → roles/ceph-common/templates/rgw.conf
View File

0
roles/ceph-rgw/templates/s3gw.fcgi.j2 → roles/ceph-common/templates/s3gw.fcgi.j2
View File

10
roles/ceph-rgw/defaults/main.yml
View File

@ -10,16 +10,6 @@ cephx: true
# allowing root to not require tty
radosgw_user: root
# Toggle 100-continue support for Apache and FastCGI
# WARNING: Changing this value will cause an outage of Apache while it is reinstalled on RGW nodes
http_100_continue: false
# Rados Gateway options
redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
email_address: foo@bar.com
radosgw_frontend: civetweb # we currently only support a single backend
##########
# DOCKER #
##########

41
roles/ceph-rgw/files/cephdev.asc
View File

@ -1,41 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
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
=per8
-----END PGP PUBLIC KEY BLOCK-----

14
roles/ceph-rgw/handlers/main.yml
View File

@ -1,14 +0,0 @@
---
- name: restart apache2
service: >
name=apache2
state=restarted
enabled=yes
when: ansible_os_family == 'Debian'
- name: restart apache2
service: >
name=httpd
state=restarted
enabled=yes
when: ansible_os_family == 'RedHat'

29
roles/ceph-rgw/tasks/main.yml
View File

@ -2,35 +2,6 @@
- include: pre_requisite.yml
when: not ceph_containerized_deployment
- include: ./installs/install_redhat.yml
when:
ansible_os_family == 'RedHat' and
radosgw_frontend == 'apache' and not
ceph_containerized_deployment
- include: ./installs/install_debian.yml
when:
ansible_os_family == 'Debian' and
radosgw_frontend == 'apache' and not
ceph_containerized_deployment
- name: install rados gateway
apt: >
pkg=radosgw
state=present
update_cache=yes
when:
ansible_os_family == 'Debian' and not
ceph_containerized_deployment
- name: install rados gateway
yum: >
name=ceph-radosgw
state=present
when:
ansible_os_family == 'RedHat' and not
ceph_containerized_deployment
- include: openstack-keystone.yml
when: radosgw_keystone

9
roles/ceph-rgw/tasks/start_radosgw.yml
View File

@ -2,6 +2,7 @@
- name: check if rgw is started
command: /etc/init.d/radosgw status
register: rgwstatus
changed_when: false
failed_when: false
- name: start rgw
@ -11,9 +12,15 @@
ansible_distribution != "Ubuntu" and
ansible_os_family != 'RedHat'
- name: activate rgw on ubuntu
command: initctl emit radosgw cluster=ceph id=rgw.{{ ansible_hostname }}
changed_when: false
when: ansible_distribution == 'Ubuntu'
- name: start rgw on ubuntu
service: >
name=radosgw-all
name=radosgw
args=id=rgw.{{ ansible_hostname }}
state=started
when: ansible_distribution == 'Ubuntu'