From effefe91d51d8e59dcd2bf33ad432c9d873a839e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 21 Feb 2017 12:00:37 -0500 Subject: [PATCH 1/2] common: add doc for rgw on ipv6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See: https://bugzilla.redhat.com/show_bug.cgi?id=1424799 Signed-off-by: Sébastien Han --- group_vars/all.yml.sample | 2 +- roles/ceph-common/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 2cf51f8bb..4e1ab81ca 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -294,7 +294,7 @@ dummy: #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls #radosgw_resolve_cname: false # enable for radosgw to resolve DNS CNAME based bucket names #radosgw_civetweb_port: 8080 # on Infernalis we get: "set_ports_option: cannot bind to 80: 13 (Permission denied)" -#radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}" +#radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}" # when using ipv6 enclose with brackets: "[{{ ansible_default_ipv6.address }}]" #radosgw_civetweb_num_threads: 50 # For additional civetweb configuration options available such as SSL, logging, # keepalive, and timeout settings, please see the civetweb docs at diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index c5a564326..0573d9017 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -286,7 +286,7 @@ mds_max_mds: 3 #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls radosgw_resolve_cname: false # enable for radosgw to resolve DNS CNAME based bucket names radosgw_civetweb_port: 8080 # on Infernalis we get: "set_ports_option: cannot bind to 80: 13 (Permission denied)" -radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}" +radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}" # when using ipv6 enclose with brackets: "[{{ ansible_default_ipv6.address }}]" radosgw_civetweb_num_threads: 50 # For additional civetweb configuration options available such as SSL, logging, # keepalive, and timeout settings, please see the civetweb docs at From 9e7fbbd6c5873366a71f282f91773712f7be8f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 21 Feb 2017 12:01:08 -0500 Subject: [PATCH 2/2] docker-common: sync group_vars file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- group_vars/docker-commons.yml.sample | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 group_vars/docker-commons.yml.sample diff --git a/group_vars/docker-commons.yml.sample b/group_vars/docker-commons.yml.sample new file mode 100644 index 000000000..69bcc8401 --- /dev/null +++ b/group_vars/docker-commons.yml.sample @@ -0,0 +1,12 @@ +--- +# Variables here are applicable to all host groups NOT roles + +# This sample file generated by generate_group_vars_sample.sh + +# Dummy variable to avoid error because ansible does not recognize the +# file as a good configuration file when no variable in it. +dummy: + + +#ceph_docker_registry: docker.io +