mirror of https://github.com/ceph/ceph-ansible.git
rgws: renames create_pools variable with rgw_create_pools.
Renamed to be consistent with the role (rgw) and have a meaningful name. Signed-off-by: Jorge Tudela <jtudelag@redhat.com>pull/2696/head
parent
8704144e31
commit
600e1e2c26
|
@ -41,8 +41,8 @@ dummy:
|
|||
# This is important because they would be created with the default
|
||||
# of 8.
|
||||
# New pools and their corresponding pg_nums can be created
|
||||
# by adding to the create_pools dictionary (see foo).
|
||||
#create_pools:
|
||||
# by adding to the rgw_create_pools dictionary (see foo).
|
||||
#rgw_create_pools:
|
||||
# defaults.rgw.buckets.data:
|
||||
# pg_num: 16
|
||||
# defaults.rgw.buckets.index:
|
||||
|
|
|
@ -33,8 +33,8 @@ rgw_pull_proto: "http"
|
|||
# This is important because they would be created with the default
|
||||
# of 8.
|
||||
# New pools and their corresponding pg_nums can be created
|
||||
# by adding to the create_pools dictionary (see foo).
|
||||
#create_pools:
|
||||
# by adding to the rgw_create_pools dictionary (see foo).
|
||||
#rgw_create_pools:
|
||||
# defaults.rgw.buckets.data:
|
||||
# pg_num: 16
|
||||
# defaults.rgw.buckets.index:
|
||||
|
|
|
@ -10,4 +10,4 @@
|
|||
- name: include rgw_pool_pgs.yml
|
||||
include: rgw_pool_pgs.yml
|
||||
when:
|
||||
- create_pools is defined
|
||||
- rgw_create_pools is defined
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
---
|
||||
# If admin key has been copied to the RGWs, we can run the command from them.
|
||||
- name: create rgw pools if create_pools is defined
|
||||
- name: create rgw pools if rgw_create_pools is defined
|
||||
command: "{{ docker_exec_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}"
|
||||
changed_when: false
|
||||
run_once: true
|
||||
with_dict: "{{ create_pools }}"
|
||||
with_dict: "{{ rgw_create_pools }}"
|
||||
when:
|
||||
- copy_admin_key
|
||||
|
||||
|
@ -16,11 +16,11 @@
|
|||
- not copy_admin_key
|
||||
|
||||
# If no admin key has been copied to the RGWs, we have to run the command from the first monitor.
|
||||
- name: create rgw pools if create_pools is defined, delegated to first monitor
|
||||
- name: create rgw pools if rgw_create_pools is defined, delegated to first monitor
|
||||
command: "{{ docker_exec_mon_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}"
|
||||
changed_when: false
|
||||
run_once: true
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
with_dict: "{{ create_pools }}"
|
||||
with_dict: "{{ rgw_create_pools }}"
|
||||
when:
|
||||
- not copy_admin_key
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
- name: include rgw_pool_pgs.yml
|
||||
include: rgw_pool_pgs.yml
|
||||
when:
|
||||
- create_pools is defined
|
||||
- rgw_create_pools is defined
|
||||
- not containerized_deployment
|
||||
static: False
|
||||
|
||||
|
@ -51,9 +51,3 @@
|
|||
- containerized_deployment
|
||||
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
|
||||
static: False
|
||||
|
||||
- name: include rgw_pool_pgs.yml
|
||||
include: rgw_pool_pgs.yml
|
||||
when:
|
||||
- create_pools is defined
|
||||
static: False
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
---
|
||||
- name: create rgw pools if create_pools is defined
|
||||
- name: create rgw pools if rgw_create_pools is defined
|
||||
command: ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}
|
||||
changed_when: false
|
||||
run_once: true
|
||||
with_dict: "{{ create_pools }}"
|
||||
with_dict: "{{ rgw_create_pools }}"
|
||||
when:
|
||||
- not containerized_deployment
|
||||
|
||||
|
@ -14,11 +14,11 @@
|
|||
when:
|
||||
- containerized_deployment
|
||||
|
||||
- name: create rgw pools if create_pools is defined
|
||||
- name: create rgw pools if rgw_create_pools is defined
|
||||
command: "{{ docker_exec_rgw_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}"
|
||||
changed_when: false
|
||||
run_once: true
|
||||
with_dict: "{{ create_pools }}"
|
||||
with_dict: "{{ rgw_create_pools }}"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
when:
|
||||
- containerized_deployment
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
copy_admin_key: True
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
|
@ -21,7 +21,7 @@ class TestRGWs(object):
|
|||
def test_rgw_tuning_pools_are_set(self, node, host):
|
||||
cmd = "sudo ceph --cluster={} --connect-timeout 5 osd dump".format(node["cluster_name"])
|
||||
output = host.check_output(cmd)
|
||||
pools = node["vars"]["create_pools"]
|
||||
pools = node["vars"]["rgw_create_pools"]
|
||||
for pool_name, pg_num in pools.items():
|
||||
assert pool_name in output
|
||||
pg_num_str = "pg_num {pg_num}".format(pg_num=pg_num["pg_num"])
|
||||
|
@ -36,7 +36,7 @@ class TestRGWs(object):
|
|||
cluster=cluster
|
||||
)
|
||||
output = host.check_output(cmd)
|
||||
pools = node["vars"]["create_pools"]
|
||||
pools = node["vars"]["rgw_create_pools"]
|
||||
for pool_name, pg_num in pools.items():
|
||||
assert pool_name in output
|
||||
pg_num_str = "pg_num {pg_num}".format(pg_num=pg_num["pg_num"])
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
copy_admin_key: true
|
||||
create_pools:
|
||||
rgw_create_pools:
|
||||
foo:
|
||||
pg_num: 17
|
||||
bar:
|
||||
|
|
Loading…
Reference in New Issue