From d7c17812dd17cf5b8ffac33bab2a3be8dce23fa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 21 Oct 2015 23:18:22 +0200 Subject: [PATCH] Ability to collocate bare metal and container MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since we renamed the variables and removed the old 'docker' variable we can now collocate container daemons with standard bare metal deployment. For instance, monitors can be containerized but osds can be deployed traditionally. Signed-off-by: Sébastien Han --- group_vars/all.sample | 7 ------- group_vars/mdss.sample | 2 +- group_vars/mons.sample | 2 +- group_vars/osds.sample | 2 +- group_vars/restapis.sample | 2 +- group_vars/rgws.sample | 2 +- roles/ceph-mds/defaults/main.yml | 2 +- roles/ceph-mds/meta/main.yml | 2 +- roles/ceph-mds/tasks/main.yml | 4 ++-- roles/ceph-mon/defaults/main.yml | 2 +- roles/ceph-mon/meta/main.yml | 2 +- roles/ceph-mon/tasks/main.yml | 10 +++++----- roles/ceph-osd/defaults/main.yml | 2 +- roles/ceph-osd/meta/main.yml | 2 +- roles/ceph-osd/tasks/main.yml | 10 +++++----- roles/ceph-restapi/defaults/main.yml | 2 +- roles/ceph-restapi/meta/main.yml | 2 +- roles/ceph-restapi/tasks/main.yml | 6 +++--- roles/ceph-rgw/defaults/main.yml | 2 +- roles/ceph-rgw/meta/main.yml | 2 +- roles/ceph-rgw/tasks/main.yml | 6 +++--- 21 files changed, 33 insertions(+), 40 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index dbda68c66..b7fbee6a7 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -226,10 +226,3 @@ dummy: # - { name: fs.file-max, value: 26234859 } # - { name: vm.zone_reclaim_mode, value: 0 } # - { name: vm.vfs_cache_pressure, value: 50 } - - -########## -# DOCKER # -########## - -#docker: false diff --git a/group_vars/mdss.sample b/group_vars/mdss.sample index 425e2ccee..fae7bc279 100644 --- a/group_vars/mdss.sample +++ b/group_vars/mdss.sample @@ -15,7 +15,7 @@ dummy: # DOCKER # ########## -#ceph_containerized_deployment: false +#mds_containerized_deployment: false #ceph_mds_docker_username: ceph #ceph_mds_docker_imagename: daemon #ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/group_vars/mons.sample b/group_vars/mons.sample index 51ef6b307..dc7607b89 100644 --- a/group_vars/mons.sample +++ b/group_vars/mons.sample @@ -55,7 +55,7 @@ dummy: # DOCKER # ########## -#ceph_containerized_deployment: false +#mon_containerized_deployment: false #ceph_mon_docker_username: ceph #ceph_mon_docker_imagename: "daemon" #ceph_mon_docker_interface: eth0 diff --git a/group_vars/osds.sample b/group_vars/osds.sample index a5c07a2e0..c9516c73e 100644 --- a/group_vars/osds.sample +++ b/group_vars/osds.sample @@ -113,7 +113,7 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host # DOCKER # ########## -#ceph_containerized_deployment: false +#osd_containerized_deployment: false #ceph_osd_docker_username: ceph #ceph_osd_docker_imagename: daemon #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables diff --git a/group_vars/restapis.sample b/group_vars/restapis.sample index 42e4095b5..ca6e1b90b 100644 --- a/group_vars/restapis.sample +++ b/group_vars/restapis.sample @@ -14,7 +14,7 @@ dummy: # DOCKER # ########## -#ceph_containerized_deployment: false +#restapi_containerized_deployment: false #ceph_restapi_docker_interface: eth0 #ceph_restapi_port: 5000 #ceph_restapi_docker_username: ceph diff --git a/group_vars/rgws.sample b/group_vars/rgws.sample index e00c3eaa0..707c36116 100644 --- a/group_vars/rgws.sample +++ b/group_vars/rgws.sample @@ -20,7 +20,7 @@ dummy: # DOCKER # ########## -#ceph_containerized_deployment: false +#rgw_containerized_deployment: false #ceph_rgw_docker_username: ceph #ceph_rgw_docker_imagename: daemon #ceph_rgw_civetweb_port: 80 diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml index a5d60a7e0..1bedb16e0 100644 --- a/roles/ceph-mds/defaults/main.yml +++ b/roles/ceph-mds/defaults/main.yml @@ -14,7 +14,7 @@ cephx: true # DOCKER # ########## -ceph_containerized_deployment: false +mds_containerized_deployment: false ceph_mds_docker_username: ceph ceph_mds_docker_imagename: daemon ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/roles/ceph-mds/meta/main.yml b/roles/ceph-mds/meta/main.yml index 665de2cb3..3cd000afc 100644 --- a/roles/ceph-mds/meta/main.yml +++ b/roles/ceph-mds/meta/main.yml @@ -11,4 +11,4 @@ galaxy_info: categories: - system dependencies: - - { role: ceph-common, when: not docker } + - { role: ceph-common, when: not mds_containerized_deployment } diff --git a/roles/ceph-mds/tasks/main.yml b/roles/ceph-mds/tasks/main.yml index 40a43dd09..f932e584a 100644 --- a/roles/ceph-mds/tasks/main.yml +++ b/roles/ceph-mds/tasks/main.yml @@ -1,6 +1,6 @@ --- - include: pre_requisite.yml - when: not ceph_containerized_deployment + when: not mds_containerized_deployment - include: ./docker/main.yml - when: ceph_containerized_deployment + when: mds_containerized_deployment diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index 50fd1e581..f7360db7d 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -60,7 +60,7 @@ openstack_keys: # DOCKER # ########## -ceph_containerized_deployment: false +mon_containerized_deployment: false ceph_mon_docker_interface: eth0 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface ceph_mon_docker_username: ceph diff --git a/roles/ceph-mon/meta/main.yml b/roles/ceph-mon/meta/main.yml index 72e176d98..b22c7c3f0 100644 --- a/roles/ceph-mon/meta/main.yml +++ b/roles/ceph-mon/meta/main.yml @@ -11,4 +11,4 @@ galaxy_info: categories: - system dependencies: - - { role: ceph-common, when: not docker } + - { role: ceph-common, when: not mon_containerized_deployment } diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml index 100051434..5b292beca 100644 --- a/roles/ceph-mon/tasks/main.yml +++ b/roles/ceph-mon/tasks/main.yml @@ -1,12 +1,12 @@ --- - include: deploy_monitors.yml - when: not ceph_containerized_deployment + when: not mon_containerized_deployment - include: start_monitor.yml - when: not ceph_containerized_deployment + when: not mon_containerized_deployment - include: ceph_keys.yml - when: not ceph_containerized_deployment + when: not mon_containerized_deployment - include: create_mds_filesystems.yml when: @@ -16,7 +16,7 @@ - include: secure_cluster.yml when: secure_cluster and - not ceph_containerized_deployment + not mon_containerized_deployment - include: ./docker/main.yml - when: ceph_containerized_deployment + when: mon_containerized_deployment diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 0c56a4267..046a765d4 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -108,7 +108,7 @@ osd_directory: false # DOCKER # ########## -ceph_containerized_deployment: false +osd_containerized_deployment: false ceph_osd_docker_username: ceph ceph_osd_docker_imagename: daemon ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables diff --git a/roles/ceph-osd/meta/main.yml b/roles/ceph-osd/meta/main.yml index 5d1a82cec..37b426cf0 100644 --- a/roles/ceph-osd/meta/main.yml +++ b/roles/ceph-osd/meta/main.yml @@ -11,4 +11,4 @@ galaxy_info: categories: - system dependencies: - - { role: ceph-common, when: not docker } + - { role: ceph-common, when: not osd_containerized_deployment } diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml index f6070888f..4ae3faa20 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -1,16 +1,16 @@ --- - include: pre_requisite.yml - when: not ceph_containerized_deployment + when: not osd_containerized_deployment - include: ./scenarios/journal_collocation.yml - when: journal_collocation and not ceph_containerized_deployment + when: journal_collocation and not osd_containerized_deployment - include: ./scenarios/raw_multi_journal.yml - when: raw_multi_journal and not ceph_containerized_deployment + when: raw_multi_journal and not osd_containerized_deployment - include: ./scenarios/osd_directory.yml - when: osd_directory and not ceph_containerized_deployment + when: osd_directory and not osd_containerized_deployment - include: ./docker/main.yml - when: ceph_containerized_deployment + when: osd_containerized_deployment diff --git a/roles/ceph-restapi/defaults/main.yml b/roles/ceph-restapi/defaults/main.yml index 59236dc44..c8320c114 100644 --- a/roles/ceph-restapi/defaults/main.yml +++ b/roles/ceph-restapi/defaults/main.yml @@ -10,7 +10,7 @@ fetch_directory: fetch/ # DOCKER # ########## -ceph_containerized_deployment: false +restapi_containerized_deployment: false ceph_restapi_docker_interface: eth0 ceph_restapi_port: 5000 ceph_restapi_docker_username: ceph diff --git a/roles/ceph-restapi/meta/main.yml b/roles/ceph-restapi/meta/main.yml index e9e8850ee..30a5eb700 100644 --- a/roles/ceph-restapi/meta/main.yml +++ b/roles/ceph-restapi/meta/main.yml @@ -11,4 +11,4 @@ galaxy_info: categories: - system dependencies: - - { role: ceph-common, when: not docker } + - { role: ceph-common, when: not restapi_containerized_deployment } diff --git a/roles/ceph-restapi/tasks/main.yml b/roles/ceph-restapi/tasks/main.yml index b5d15d694..571d4c98d 100644 --- a/roles/ceph-restapi/tasks/main.yml +++ b/roles/ceph-restapi/tasks/main.yml @@ -1,9 +1,9 @@ --- - include: pre_requisite.yml - when: not ceph_containerized_deployment + when: not restapi_containerized_deployment - include: start_restapi.yml - when: not ceph_containerized_deployment + when: not restapi_containerized_deployment - include: ./docker/main.yml - when: ceph_containerized_deployment + when: restapi_containerized_deployment diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index ca81641f4..cee4bf9b6 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -20,7 +20,7 @@ radosgw_user: root # DOCKER # ########## -ceph_containerized_deployment: false +rgw_containerized_deployment: false ceph_rgw_civetweb_port: 80 ceph_rgw_docker_username: ceph ceph_rgw_docker_imagename: daemon diff --git a/roles/ceph-rgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml index 9fc270d3b..fe0c03d2e 100644 --- a/roles/ceph-rgw/meta/main.yml +++ b/roles/ceph-rgw/meta/main.yml @@ -11,4 +11,4 @@ galaxy_info: categories: - system dependencies: - - { role: ceph-common, when: not docker } + - { role: ceph-common, when: not rgw_containerized_deployment } diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml index 7b7e73057..91c8c9f79 100644 --- a/roles/ceph-rgw/tasks/main.yml +++ b/roles/ceph-rgw/tasks/main.yml @@ -1,12 +1,12 @@ --- - include: pre_requisite.yml - when: not ceph_containerized_deployment + when: not rgw_containerized_deployment - include: openstack-keystone.yml when: radosgw_keystone - include: start_radosgw.yml - when: not ceph_containerized_deployment + when: not rgw_containerized_deployment - include: ./docker/main.yml - when: ceph_containerized_deployment + when: rgw_containerized_deployment -- 2.39.5