From d2359c14456ac378af02f11a996ac5b85a3d90f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 2 Mar 2016 12:00:51 +0100 Subject: [PATCH] wip: galaxy roles dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit in order to have a build on the galaxy we need to have a proper dependency set for ceph-common. On the galaxy ceph-common does not exist, only ceph.ceph-common is available. Signed-off-by: Sébastien Han --- roles/ceph-mds/meta/main.yml | 2 +- roles/ceph-mon/meta/main.yml | 2 +- roles/ceph-osd/meta/main.yml | 2 +- roles/ceph-restapi/meta/main.yml | 2 +- roles/ceph-rgw/meta/main.yml | 2 +- roles/{ceph-common => ceph.ceph-common}/LICENSE | 0 roles/{ceph-common => ceph.ceph-common}/README.md | 0 roles/{ceph-common => ceph.ceph-common}/defaults/main.yml | 0 roles/{ceph-common => ceph.ceph-common}/files/cephdev.asc | 0 roles/{ceph-common => ceph.ceph-common}/files/cephstable.asc | 0 roles/{ceph-common => ceph.ceph-common}/files/cephstableice.asc | 0 roles/{ceph-common => ceph.ceph-common}/handlers/main.yml | 0 roles/{ceph-common => ceph.ceph-common}/meta/main.yml | 0 .../plugins/actions/config_template.py | 0 .../tasks/checks/check_firewall.yml | 0 .../tasks/checks/check_mandatory_vars.yml | 0 .../tasks/checks/check_system.yml | 0 .../tasks/installs/debian_ceph_repository.yml | 0 .../tasks/installs/install_on_debian.yml | 0 .../tasks/installs/install_on_redhat.yml | 0 .../tasks/installs/install_rgw_on_debian.yml | 0 .../tasks/installs/install_rgw_on_redhat.yml | 0 .../tasks/installs/redhat_ceph_repository.yml | 0 roles/{ceph-common => ceph.ceph-common}/tasks/main.yml | 0 .../tasks/misc/system_tuning.yml | 0 .../tasks/pre_requisites/prerequisite_ice.yml | 0 .../pre_requisites/prerequisite_rh_storage_cdn_install.yml | 0 .../pre_requisites/prerequisite_rh_storage_iso_install.yml | 0 .../{ceph-common => ceph.ceph-common}/templates/ceph-extra.repo | 0 roles/{ceph-common => ceph.ceph-common}/templates/ceph.conf.j2 | 0 roles/{ceph-common => ceph.ceph-common}/templates/httpd.conf | 0 .../templates/redhat_ice_repo.j2 | 0 .../templates/redhat_storage_repo.j2 | 0 roles/{ceph-common => ceph.ceph-common}/templates/rgw.conf | 0 roles/{ceph-common => ceph.ceph-common}/templates/s3gw.fcgi.j2 | 0 test.yml | 2 +- 36 files changed, 6 insertions(+), 6 deletions(-) rename roles/{ceph-common => ceph.ceph-common}/LICENSE (100%) rename roles/{ceph-common => ceph.ceph-common}/README.md (100%) rename roles/{ceph-common => ceph.ceph-common}/defaults/main.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/files/cephdev.asc (100%) rename roles/{ceph-common => ceph.ceph-common}/files/cephstable.asc (100%) rename roles/{ceph-common => ceph.ceph-common}/files/cephstableice.asc (100%) rename roles/{ceph-common => ceph.ceph-common}/handlers/main.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/meta/main.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/plugins/actions/config_template.py (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/checks/check_firewall.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/checks/check_mandatory_vars.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/checks/check_system.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/debian_ceph_repository.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/install_on_debian.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/install_on_redhat.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/install_rgw_on_debian.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/install_rgw_on_redhat.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/installs/redhat_ceph_repository.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/main.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/misc/system_tuning.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/pre_requisites/prerequisite_ice.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/ceph-extra.repo (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/ceph.conf.j2 (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/httpd.conf (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/redhat_ice_repo.j2 (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/redhat_storage_repo.j2 (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/rgw.conf (100%) rename roles/{ceph-common => ceph.ceph-common}/templates/s3gw.fcgi.j2 (100%) diff --git a/roles/ceph-mds/meta/main.yml b/roles/ceph-mds/meta/main.yml index 3cd000afc..cd2ec79c1 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 mds_containerized_deployment } + - { role: ceph.ceph-common, when: not mds_containerized_deployment } diff --git a/roles/ceph-mon/meta/main.yml b/roles/ceph-mon/meta/main.yml index b22c7c3f0..1dff82653 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 mon_containerized_deployment } + - { role: ceph.ceph-common, when: not mon_containerized_deployment } diff --git a/roles/ceph-osd/meta/main.yml b/roles/ceph-osd/meta/main.yml index 37b426cf0..9c5b77fd7 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 osd_containerized_deployment } + - { role: ceph.ceph-common, when: not osd_containerized_deployment } diff --git a/roles/ceph-restapi/meta/main.yml b/roles/ceph-restapi/meta/main.yml index f1be20a07..da3adeb37 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 restapi_containerized_deployment } + - { role: ceph.ceph-common, when: not restapi_containerized_deployment } diff --git a/roles/ceph-rgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml index fe0c03d2e..6cb4c6d63 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 rgw_containerized_deployment } + - { role: ceph.ceph-common, when: not rgw_containerized_deployment } diff --git a/roles/ceph-common/LICENSE b/roles/ceph.ceph-common/LICENSE similarity index 100% rename from roles/ceph-common/LICENSE rename to roles/ceph.ceph-common/LICENSE diff --git a/roles/ceph-common/README.md b/roles/ceph.ceph-common/README.md similarity index 100% rename from roles/ceph-common/README.md rename to roles/ceph.ceph-common/README.md diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph.ceph-common/defaults/main.yml similarity index 100% rename from roles/ceph-common/defaults/main.yml rename to roles/ceph.ceph-common/defaults/main.yml diff --git a/roles/ceph-common/files/cephdev.asc b/roles/ceph.ceph-common/files/cephdev.asc similarity index 100% rename from roles/ceph-common/files/cephdev.asc rename to roles/ceph.ceph-common/files/cephdev.asc diff --git a/roles/ceph-common/files/cephstable.asc b/roles/ceph.ceph-common/files/cephstable.asc similarity index 100% rename from roles/ceph-common/files/cephstable.asc rename to roles/ceph.ceph-common/files/cephstable.asc diff --git a/roles/ceph-common/files/cephstableice.asc b/roles/ceph.ceph-common/files/cephstableice.asc similarity index 100% rename from roles/ceph-common/files/cephstableice.asc rename to roles/ceph.ceph-common/files/cephstableice.asc diff --git a/roles/ceph-common/handlers/main.yml b/roles/ceph.ceph-common/handlers/main.yml similarity index 100% rename from roles/ceph-common/handlers/main.yml rename to roles/ceph.ceph-common/handlers/main.yml diff --git a/roles/ceph-common/meta/main.yml b/roles/ceph.ceph-common/meta/main.yml similarity index 100% rename from roles/ceph-common/meta/main.yml rename to roles/ceph.ceph-common/meta/main.yml diff --git a/roles/ceph-common/plugins/actions/config_template.py b/roles/ceph.ceph-common/plugins/actions/config_template.py similarity index 100% rename from roles/ceph-common/plugins/actions/config_template.py rename to roles/ceph.ceph-common/plugins/actions/config_template.py diff --git a/roles/ceph-common/tasks/checks/check_firewall.yml b/roles/ceph.ceph-common/tasks/checks/check_firewall.yml similarity index 100% rename from roles/ceph-common/tasks/checks/check_firewall.yml rename to roles/ceph.ceph-common/tasks/checks/check_firewall.yml diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph.ceph-common/tasks/checks/check_mandatory_vars.yml similarity index 100% rename from roles/ceph-common/tasks/checks/check_mandatory_vars.yml rename to roles/ceph.ceph-common/tasks/checks/check_mandatory_vars.yml diff --git a/roles/ceph-common/tasks/checks/check_system.yml b/roles/ceph.ceph-common/tasks/checks/check_system.yml similarity index 100% rename from roles/ceph-common/tasks/checks/check_system.yml rename to roles/ceph.ceph-common/tasks/checks/check_system.yml diff --git a/roles/ceph-common/tasks/installs/debian_ceph_repository.yml b/roles/ceph.ceph-common/tasks/installs/debian_ceph_repository.yml similarity index 100% rename from roles/ceph-common/tasks/installs/debian_ceph_repository.yml rename to roles/ceph.ceph-common/tasks/installs/debian_ceph_repository.yml diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph.ceph-common/tasks/installs/install_on_debian.yml similarity index 100% rename from roles/ceph-common/tasks/installs/install_on_debian.yml rename to roles/ceph.ceph-common/tasks/installs/install_on_debian.yml diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph.ceph-common/tasks/installs/install_on_redhat.yml similarity index 100% rename from roles/ceph-common/tasks/installs/install_on_redhat.yml rename to roles/ceph.ceph-common/tasks/installs/install_on_redhat.yml diff --git a/roles/ceph-common/tasks/installs/install_rgw_on_debian.yml b/roles/ceph.ceph-common/tasks/installs/install_rgw_on_debian.yml similarity index 100% rename from roles/ceph-common/tasks/installs/install_rgw_on_debian.yml rename to roles/ceph.ceph-common/tasks/installs/install_rgw_on_debian.yml diff --git a/roles/ceph-common/tasks/installs/install_rgw_on_redhat.yml b/roles/ceph.ceph-common/tasks/installs/install_rgw_on_redhat.yml similarity index 100% rename from roles/ceph-common/tasks/installs/install_rgw_on_redhat.yml rename to roles/ceph.ceph-common/tasks/installs/install_rgw_on_redhat.yml diff --git a/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml b/roles/ceph.ceph-common/tasks/installs/redhat_ceph_repository.yml similarity index 100% rename from roles/ceph-common/tasks/installs/redhat_ceph_repository.yml rename to roles/ceph.ceph-common/tasks/installs/redhat_ceph_repository.yml diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph.ceph-common/tasks/main.yml similarity index 100% rename from roles/ceph-common/tasks/main.yml rename to roles/ceph.ceph-common/tasks/main.yml diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph.ceph-common/tasks/misc/system_tuning.yml similarity index 100% rename from roles/ceph-common/tasks/misc/system_tuning.yml rename to roles/ceph.ceph-common/tasks/misc/system_tuning.yml diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_ice.yml b/roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_ice.yml similarity index 100% rename from roles/ceph-common/tasks/pre_requisites/prerequisite_ice.yml rename to roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_ice.yml diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml b/roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml similarity index 100% rename from roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml rename to roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml b/roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml similarity index 100% rename from roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml rename to roles/ceph.ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml diff --git a/roles/ceph-common/templates/ceph-extra.repo b/roles/ceph.ceph-common/templates/ceph-extra.repo similarity index 100% rename from roles/ceph-common/templates/ceph-extra.repo rename to roles/ceph.ceph-common/templates/ceph-extra.repo diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph.ceph-common/templates/ceph.conf.j2 similarity index 100% rename from roles/ceph-common/templates/ceph.conf.j2 rename to roles/ceph.ceph-common/templates/ceph.conf.j2 diff --git a/roles/ceph-common/templates/httpd.conf b/roles/ceph.ceph-common/templates/httpd.conf similarity index 100% rename from roles/ceph-common/templates/httpd.conf rename to roles/ceph.ceph-common/templates/httpd.conf diff --git a/roles/ceph-common/templates/redhat_ice_repo.j2 b/roles/ceph.ceph-common/templates/redhat_ice_repo.j2 similarity index 100% rename from roles/ceph-common/templates/redhat_ice_repo.j2 rename to roles/ceph.ceph-common/templates/redhat_ice_repo.j2 diff --git a/roles/ceph-common/templates/redhat_storage_repo.j2 b/roles/ceph.ceph-common/templates/redhat_storage_repo.j2 similarity index 100% rename from roles/ceph-common/templates/redhat_storage_repo.j2 rename to roles/ceph.ceph-common/templates/redhat_storage_repo.j2 diff --git a/roles/ceph-common/templates/rgw.conf b/roles/ceph.ceph-common/templates/rgw.conf similarity index 100% rename from roles/ceph-common/templates/rgw.conf rename to roles/ceph.ceph-common/templates/rgw.conf diff --git a/roles/ceph-common/templates/s3gw.fcgi.j2 b/roles/ceph.ceph-common/templates/s3gw.fcgi.j2 similarity index 100% rename from roles/ceph-common/templates/s3gw.fcgi.j2 rename to roles/ceph.ceph-common/templates/s3gw.fcgi.j2 diff --git a/test.yml b/test.yml index d31b5d547..d01a16d2b 100644 --- a/test.yml +++ b/test.yml @@ -2,7 +2,7 @@ - hosts: localhost sudo: true roles: - - ceph-common + - ceph.ceph-common - ceph-mon - ceph-osd - ceph-mds -- 2.39.5