]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
resync group_vars/*.sample files
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 26 Oct 2018 07:46:29 +0000 (09:46 +0200)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Fri, 26 Oct 2018 08:44:08 +0000 (08:44 +0000)
ee2d52d33df2a311cdf0ff62abd353fccb3affbc missed this sync between
ceph-defaults/defaults/main.yml and group_vars/all.yml.sampl

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
group_vars/all.yml.sample
group_vars/clients.yml.sample
group_vars/iscsigws.yml.sample
group_vars/rgws.yml.sample
group_vars/rhcs.yml.sample

index f2fc4d54bdd95104c3ce553360f3703af484e9eb..7b1572ae3227a404c37e3df90fbd30ca7e3e4a93 100644 (file)
@@ -354,8 +354,8 @@ dummy:
 #cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
 
 #cephfs_pools:
-#  - { name: "{{ cephfs_data }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" }
-#  - { name: "{{ cephfs_metadata }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" }
+#  - { name: "{{ cephfs_data }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}", size: "" }
+#  - { name: "{{ cephfs_metadata }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}", size: "" }
 
 ## OSD options
 #
@@ -599,6 +599,26 @@ dummy:
 #  expected_num_objects: ""
 #  application: "rbd"
 #  size: ""
+#openstack_cephfs_data_pool:
+#  name: "manila_data"
+#  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  rule_name: "replicated_rule"
+#  type: 1
+#  erasure_profile: ""
+#  expected_num_objects: ""
+#  application: "rbd"
+#  size: ""
+#openstack_cephfs_metadata_pool:
+#  name: "manila_metadata"
+#  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  rule_name: "replicated_rule"
+#  type: 1
+#  erasure_profile: ""
+#  expected_num_objects: ""
+#  application: "rbd"
+#  size: ""
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"
@@ -606,6 +626,8 @@ dummy:
 #  - "{{ openstack_nova_pool }}"
 #  - "{{ openstack_cinder_backup_pool }}"
 #  - "{{ openstack_gnocchi_pool }}"
+#  - "{{ openstack_cephfs_data_pool }}"
+#  - "{{ openstack_cephfs_metadata_pool }}"
 
 
 # The value for 'key' can be a pre-generated key,
index 01d54404d352b61a21146fa13b59e8367ab29274..5bae33868e4170659d6e9a6df9615498565d135c 100644 (file)
@@ -26,6 +26,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  size: ""
 #test2:
 #  name: "test2"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -34,6 +35,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  size: ""
 #pools:
 #  - "{{ test }}"
 #  - "{{ test2 }}"
index 4424324734ca0940ea8d25ca28316a248fe1c879..fbed716f197a64d938e005300ff47906c1b11d67 100644 (file)
@@ -64,6 +64,7 @@ dummy:
 # Whether or not to generate secure certificate to iSCSI gateway nodes
 #generate_crt: False
 
+#rbd_pool_size: ""
 
 ##################
 # RBD-TARGET-API #
index bfdf66b59521818c409dadbb8459edfc9dbf09bd..e8cc1c76807ba0237a1b8566b572f41027810e1e 100644 (file)
@@ -45,10 +45,13 @@ dummy:
 #rgw_create_pools:
 #  defaults.rgw.buckets.data:
 #    pg_num: 16
+#    size: ""
 #  defaults.rgw.buckets.index:
 #    pg_num: 32
+#    size: ""
 #  foo:
 #    pg_num: 4
+#    size: ""
 
 
 ##########
index 5cc7da71579467aa09ceebd7995f0eca789f48bd..7f81594effdbe3c229fef5353f1e44e3e8888b1c 100644 (file)
@@ -354,8 +354,8 @@ ceph_rhcs_version: 3
 #cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
 
 #cephfs_pools:
-#  - { name: "{{ cephfs_data }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" }
-#  - { name: "{{ cephfs_metadata }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" }
+#  - { name: "{{ cephfs_data }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}", size: "" }
+#  - { name: "{{ cephfs_metadata }}", pgs: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}", size: "" }
 
 ## OSD options
 #
@@ -599,6 +599,26 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  expected_num_objects: ""
 #  application: "rbd"
 #  size: ""
+#openstack_cephfs_data_pool:
+#  name: "manila_data"
+#  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  rule_name: "replicated_rule"
+#  type: 1
+#  erasure_profile: ""
+#  expected_num_objects: ""
+#  application: "rbd"
+#  size: ""
+#openstack_cephfs_metadata_pool:
+#  name: "manila_metadata"
+#  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
+#  rule_name: "replicated_rule"
+#  type: 1
+#  erasure_profile: ""
+#  expected_num_objects: ""
+#  application: "rbd"
+#  size: ""
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"
@@ -606,6 +626,8 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  - "{{ openstack_nova_pool }}"
 #  - "{{ openstack_cinder_backup_pool }}"
 #  - "{{ openstack_gnocchi_pool }}"
+#  - "{{ openstack_cephfs_data_pool }}"
+#  - "{{ openstack_cephfs_metadata_pool }}"
 
 
 # The value for 'key' can be a pre-generated key,