docker: consolidate ceph-ansible and ceph-docker varible

This commit re-uses some of the existing ceph-ansible variables for a
containirzed deployment. There is no reasons why we should add new
variables for the containerized deployment.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 21678d573241f7d17a3046ec2d0f49fadbd896d6..9c965e44a7a52e8fbc20215e4be798ad24339bfb 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -252,6 +252,7 @@ dummy:
 #monitor_interface: interface
 #monitor_address: 0.0.0.0
 #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
+#monitor_address_block: false
 
 ## OSD options
 #
@@ -349,25 +350,6 @@ dummy:
 #mon_containerized_deployment: false
 #mon_containerized_default_ceph_conf_with_kv: false
 
-
-##################
-# Temporary Vars #
-##################
-# NOTE(SamYaple): These vars are set here to they are defined before use. They
-# should be removed after a refactor has properly seperated all the checks into
-# the appropriate roles.
-
-#journal_collocation: False
-#raw_multi_journal: False
-#osd_directory: False
-#bluestore: False
-#dmcrypt_journal_collocation: False
-#dmcrypt_dedicated_journal: False
-#raw_journal_devices: []
-#devices: []
-
-#osd_auto_discovery: False
-
 # Confiure the type of NFS gatway access.  At least one must be enabled for an
 # NFS role to be useful
 #
@@ -375,3 +357,4 @@ dummy:
 #nfs_file_gw: true
 # Set this to true to enable Object access via NFS. Requires an RGW role.
 #nfs_obj_gw: false
+

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 5bd1cde794a3dc98213e966001f42bc6ca34280f..5edd1cdd3fd1932582abba9b3a9c5170ff26f517 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -80,12 +80,12 @@ dummy:
 #mon_containerized_deployment_with_kv: false
 # This is currently in ceph-common defaults because it is shared with ceph-nfs
 #mon_containerized_default_ceph_conf_with_kv: false
-#ceph_mon_docker_interface: eth0
-#ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
+#ceph_mon_docker_interface: "{{ monitor_interface }}"
+#ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
 #ceph_mon_docker_username: ceph
 #ceph_mon_docker_imagename: daemon
 #ceph_mon_docker_image_tag: latest
-#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
+#ceph_mon_extra_envs: "FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables
 #ceph_docker_on_openstack: false
 #mon_docker_privileged: false
 #mon_docker_net_host: true

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index b1eb4f91c1cfd99b663186b9c24a3d98910166f2..35d6f1a0099e584eeac2fc54afe8e92c2f31bab4 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -179,9 +179,8 @@ dummy:
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
 #ceph_osd_docker_image_tag: latest
-#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
-#ceph_osd_docker_devices:
-# - /dev/sdb
+#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables
+#ceph_osd_docker_devices: "{{ devices }}"
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 

diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample
index 05d5fd851a3af2a6cefcde029e0a59e8f2d0b10c..bf98e26bcf8cfd5edab2d7fe52bf7eceb788b53a 100644 (file)
--- a/group_vars/rgws.yml.sample
+++ b/group_vars/rgws.yml.sample
@@ -38,11 +38,12 @@ dummy:
 #rgw_containerized_deployment_with_kv: false
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
-#ceph_rgw_civetweb_port: 80
+#ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
 #ceph_rgw_docker_username: ceph
 #ceph_rgw_docker_imagename: daemon
 #ceph_rgw_docker_image_tag: latest
 #ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
+#rgw_config_keys: "/" # DON'T TOUCH ME
 

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 77ae55cec745bd748bee67ffb4310e6e9e877c74..dc7d2a5bf3245972db9971dd95ef1195c7830588 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -72,12 +72,12 @@ mon_containerized_deployment: false
 mon_containerized_deployment_with_kv: false
 # This is currently in ceph-common defaults because it is shared with ceph-nfs
 #mon_containerized_default_ceph_conf_with_kv: false
-ceph_mon_docker_interface: eth0
-#ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
+ceph_mon_docker_interface: "{{ monitor_interface }}"
+ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
 ceph_mon_docker_username: ceph
 ceph_mon_docker_imagename: daemon
 ceph_mon_docker_image_tag: latest
-ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
+ceph_mon_extra_envs: "FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables
 ceph_docker_on_openstack: false
 mon_docker_privileged: false
 mon_docker_net_host: true

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 4a1710c25443d1331ddd9dc391b504c7e0d953e2..1fec4633f463df3cb44264cb32e74404a47d8f3b 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -171,8 +171,7 @@ ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 ceph_osd_docker_username: ceph
 ceph_osd_docker_imagename: daemon
 ceph_osd_docker_image_tag: latest
-ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
-#ceph_osd_docker_devices:
-# - /dev/sdb
+ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE,OSD_JOURNAL_SIZE={{ journal_size }}" # comma separated variables
+ceph_osd_docker_devices: "{{ devices }}"
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index ac0cd140ca17fab1eeeee1f4d80a73ca1e635b7e..78be7a6fd3a0b85a421bc4b0bcb12de15919b1e5 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -30,7 +30,7 @@ rgw_containerized_deployment: false
 rgw_containerized_deployment_with_kv: false
 kv_type: etcd
 kv_endpoint: 127.0.0.1
-ceph_rgw_civetweb_port: 80
+ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
 ceph_rgw_docker_username: ceph
 ceph_rgw_docker_imagename: daemon
 ceph_rgw_docker_image_tag: latest