fix the radosgw_civetweb_bind_ip default value

We want just the address for ansible_default_ipv4, not the entire
dictionary in ceph.conf.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 68bbe31743e4fbf8f0032ca63494bab0eb588d59..aa2a9a7d942168ce486ce711595ba14d08493fc8 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -266,7 +266,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_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-rgw/defaults/main.yml
 #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 }}"
+#radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}"
 #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
 #radosgw_keystone_admin_token: password

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index c23d51d8bac3c09bb92c56046fa2659d42bd5b30..4122a4c7070083477d9b3471d4cb3be2c66e9a76 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -259,7 +259,7 @@ mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the
 #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-rgw/defaults/main.yml
 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 }}"
+radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}"
 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
 radosgw_keystone_admin_token: password