diff --git a/contrib/splitup.yml b/contrib/splitup.yml index 4129faeb1..0940343b2 100644 --- a/contrib/splitup.yml +++ b/contrib/splitup.yml @@ -15,21 +15,20 @@ gather_facts: False vars: - github: False + github: ceph/ansible roles: - ceph-common - ceph-mon - ceph-osd - ceph-mds - - ceph-radosgw - - haproxy + - ceph-rgw tasks: - name: check for github prefix option on commandline tags: split fail: > - msg='github prefix missing! e.g: (--extra-vars github=mhubig/ansible).' + msg='github prefix missing! e.g: (--extra-vars github=ceph/ansible).' when: github == False - name: split the repo in seperate branches @@ -63,4 +62,3 @@ git subtree push --prefix=roles/{{ item }} {{ item }} master chdir=../ with_items: roles - diff --git a/group_vars/all.sample b/group_vars/all.sample index aa87b7257..e6da18694 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -161,7 +161,7 @@ dummy: # Rados Gateway options # #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls -#radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-radosgw/defaults/main.yml +#radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-rgw/defaults/main.yml #radosgw_civetweb_port: 80 #radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/ #radosgw_keystone_url: # url:admin_port ie: http://192.168.0.1:35357 diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 181c8f993..301520f9f 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -169,7 +169,7 @@ osd_deep_scrub_stride: 1048576 ## Rados Gateway options # #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls -radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-radosgw/defaults/main.yml +radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-rgw/defaults/main.yml radosgw_civetweb_port: 80 radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/ #radosgw_keystone_url: # url:admin_port ie: http://192.168.0.1:35357 diff --git a/roles/ceph-radosgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml similarity index 100% rename from roles/ceph-radosgw/defaults/main.yml rename to roles/ceph-rgw/defaults/main.yml diff --git a/roles/ceph-radosgw/files/cephdev.asc b/roles/ceph-rgw/files/cephdev.asc similarity index 100% rename from roles/ceph-radosgw/files/cephdev.asc rename to roles/ceph-rgw/files/cephdev.asc diff --git a/roles/ceph-radosgw/handlers/main.yml b/roles/ceph-rgw/handlers/main.yml similarity index 100% rename from roles/ceph-radosgw/handlers/main.yml rename to roles/ceph-rgw/handlers/main.yml diff --git a/roles/ceph-radosgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml similarity index 100% rename from roles/ceph-radosgw/meta/main.yml rename to roles/ceph-rgw/meta/main.yml diff --git a/roles/ceph-radosgw/tasks/docker.yml b/roles/ceph-rgw/tasks/docker.yml similarity index 100% rename from roles/ceph-radosgw/tasks/docker.yml rename to roles/ceph-rgw/tasks/docker.yml diff --git a/roles/ceph-radosgw/tasks/installs/install_debian.yml b/roles/ceph-rgw/tasks/installs/install_debian.yml similarity index 100% rename from roles/ceph-radosgw/tasks/installs/install_debian.yml rename to roles/ceph-rgw/tasks/installs/install_debian.yml diff --git a/roles/ceph-radosgw/tasks/installs/install_redhat.yml b/roles/ceph-rgw/tasks/installs/install_redhat.yml similarity index 100% rename from roles/ceph-radosgw/tasks/installs/install_redhat.yml rename to roles/ceph-rgw/tasks/installs/install_redhat.yml diff --git a/roles/ceph-radosgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml similarity index 100% rename from roles/ceph-radosgw/tasks/main.yml rename to roles/ceph-rgw/tasks/main.yml diff --git a/roles/ceph-radosgw/tasks/openstack-keystone.yml b/roles/ceph-rgw/tasks/openstack-keystone.yml similarity index 100% rename from roles/ceph-radosgw/tasks/openstack-keystone.yml rename to roles/ceph-rgw/tasks/openstack-keystone.yml diff --git a/roles/ceph-radosgw/tasks/pre_requisite.yml b/roles/ceph-rgw/tasks/pre_requisite.yml similarity index 100% rename from roles/ceph-radosgw/tasks/pre_requisite.yml rename to roles/ceph-rgw/tasks/pre_requisite.yml diff --git a/roles/ceph-radosgw/tasks/start_radosgw.yml b/roles/ceph-rgw/tasks/start_radosgw.yml similarity index 100% rename from roles/ceph-radosgw/tasks/start_radosgw.yml rename to roles/ceph-rgw/tasks/start_radosgw.yml diff --git a/roles/ceph-radosgw/templates/ceph-extra.repo b/roles/ceph-rgw/templates/ceph-extra.repo similarity index 100% rename from roles/ceph-radosgw/templates/ceph-extra.repo rename to roles/ceph-rgw/templates/ceph-extra.repo diff --git a/roles/ceph-radosgw/templates/ceph.j2 b/roles/ceph-rgw/templates/ceph.j2 similarity index 100% rename from roles/ceph-radosgw/templates/ceph.j2 rename to roles/ceph-rgw/templates/ceph.j2 diff --git a/roles/ceph-radosgw/templates/httpd.conf b/roles/ceph-rgw/templates/httpd.conf similarity index 100% rename from roles/ceph-radosgw/templates/httpd.conf rename to roles/ceph-rgw/templates/httpd.conf diff --git a/roles/ceph-radosgw/templates/rgw.conf b/roles/ceph-rgw/templates/rgw.conf similarity index 100% rename from roles/ceph-radosgw/templates/rgw.conf rename to roles/ceph-rgw/templates/rgw.conf diff --git a/roles/ceph-radosgw/templates/s3gw.fcgi.j2 b/roles/ceph-rgw/templates/s3gw.fcgi.j2 similarity index 100% rename from roles/ceph-radosgw/templates/s3gw.fcgi.j2 rename to roles/ceph-rgw/templates/s3gw.fcgi.j2 diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml deleted file mode 100644 index 1e9098816..000000000 --- a/roles/haproxy/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# You can override vars by using host or group vars - -rgw_group_name: rgws - -# Rados Gateway options -radosgw_interface: eth1 # the public interface which the radosgw talks to the world with, this variable is used in the haproxy role, this does not need to be set if haproxy is not used. diff --git a/roles/haproxy/files/precise/haproxy b/roles/haproxy/files/precise/haproxy deleted file mode 100644 index 9a2ee791c..000000000 --- a/roles/haproxy/files/precise/haproxy +++ /dev/null @@ -1,4 +0,0 @@ -# Set ENABLED to 1 if you want the init script to start haproxy. -ENABLED=1 -# Add extra flags here. -#EXTRAOPTS="-de -m 16" diff --git a/roles/haproxy/handlers/main.yml b/roles/haproxy/handlers/main.yml deleted file mode 100644 index bbc920704..000000000 --- a/roles/haproxy/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -## Check distribution release -# - -- include: precise.yml - when: ansible_distribution_release == 'precise' diff --git a/roles/haproxy/handlers/precise.yml b/roles/haproxy/handlers/precise.yml deleted file mode 100644 index f2e666cf5..000000000 --- a/roles/haproxy/handlers/precise.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: restart haproxy - service: > - name=haproxy - state=restarted diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml deleted file mode 100644 index bbc920704..000000000 --- a/roles/haproxy/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -## Check distribution release -# - -- include: precise.yml - when: ansible_distribution_release == 'precise' diff --git a/roles/haproxy/tasks/precise.yml b/roles/haproxy/tasks/precise.yml deleted file mode 100644 index 428b054e9..000000000 --- a/roles/haproxy/tasks/precise.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Add repository - apt_repository: > - repo=ppa:vbernat/haproxy-1.5 - state=present - -- name: Install haproxy - apt: > - name={{ item }} - state=present - with_items: - - haproxy - - socat - -- name: Copy default configuration - copy: > - src=precise/haproxy - dest=/etc/default/haproxy - notify: restart haproxy - -- name: Create configuration - template: > - src=precise/haproxy.cfg - dest=/etc/haproxy/haproxy.cfg - backup=yes - notify: restart haproxy - -- name: Start and enable haproxy - service: > - name=haproxy - state=started - enabled=yes diff --git a/roles/haproxy/templates/precise/haproxy.cfg b/roles/haproxy/templates/precise/haproxy.cfg deleted file mode 100644 index 1bbd32534..000000000 --- a/roles/haproxy/templates/precise/haproxy.cfg +++ /dev/null @@ -1,58 +0,0 @@ -# -# {{ ansible_managed }} -# -global - log /dev/log local0 - log /dev/log local1 notice - chroot /var/lib/haproxy - user haproxy - group haproxy - daemon - stats socket /var/lib/haproxy/stats level admin - -defaults - log global - mode http - option httplog - option dontlognull - contimeout 5000 - clitimeout 50000 - srvtimeout 50000 - errorfile 400 /etc/haproxy/errors/400.http - errorfile 403 /etc/haproxy/errors/403.http - errorfile 408 /etc/haproxy/errors/408.http - errorfile 500 /etc/haproxy/errors/500.http - errorfile 502 /etc/haproxy/errors/502.http - errorfile 503 /etc/haproxy/errors/503.http - errorfile 504 /etc/haproxy/errors/504.http - -frontend http_frontend - bind *:80 - mode http - option httpclose - option forwardfor - default_backend rgw - -frontend https_frontend - bind *:443 ssl crt /etc/ceph/radosgw-key-cert.pem - mode http - option httpclose - option forwardfor - reqadd X-Forwarded-Proto:\ https - default_backend rgw - -backend rgw - mode http - balance roundrobin - cookie RADOSGWLB insert indirect nocache -{% for host in groups[rgw_group_name] %} - server {{ hostvars[host].ansible_hostname }} {{ hostvars[host]['ansible_' + radosgw_interface ].ipv4.address }}:80 check cookie {{ hostvars[host].ansible_hostname }} -{% endfor %} - -listen stats :8080 - mode http - stats enable - stats hide-version - stats realm Haproxy\ Statistics - stats uri / - #stats auth Username:Password diff --git a/rolling_update.yml b/rolling_update.yml index fbc5c091c..5465d3ebe 100644 --- a/rolling_update.yml +++ b/rolling_update.yml @@ -170,7 +170,7 @@ roles: - ceph-common - - ceph-radosgw + - ceph-rgw post_tasks: - name: restart rados gateway server(s) diff --git a/site.yml b/site.yml index faaeab4f1..411b4787d 100644 --- a/site.yml +++ b/site.yml @@ -20,4 +20,4 @@ - hosts: rgws sudo: True roles: - - ceph-radosgw + - ceph-rgw diff --git a/test.yml b/test.yml index 7b94da40e..28dbfdcb9 100644 --- a/test.yml +++ b/test.yml @@ -6,5 +6,4 @@ - ceph-mon - ceph-osd - ceph-mds - - ceph-radosgw - - haproxy + - ceph-rgw