mirror of https://github.com/ceph/ceph-ansible.git
tests: use quay.io instead of quay.ceph.io
This makes the CI use quay.io instead of quay.ceph.io
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e55ca01881)
pull/7368/head
Guillaume Abrioux
Guillaume Abrioux
parent
fb6098fa7c
commit
d464f82bad
|
|
@ -29,8 +29,8 @@ You can configure your own container register, image and tag by using the ``ceph
|
|||
|
||||
.. code-block:: yaml
|
||||
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest
|
||||
|
||||
.. note::
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ runs of ``ceph-ansible``.
|
|||
|
||||
The following environent variables are available for use:
|
||||
|
||||
* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
|
||||
* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
|
||||
|
||||
* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
|
||||
* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
|
||||
|
||||
* ``CEPH_DOCKER_IMAGE_TAG``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image_name``.
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ EXAMPLES = '''
|
|||
cephadm_adopt:
|
||||
name: mon.foo
|
||||
style: legacy
|
||||
image: quay.ceph.io/ceph/daemon-base:latest-master-devel
|
||||
image: quay.io/ceph/daemon-base:latest-main-devel
|
||||
pull: false
|
||||
firewalld: false
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ EXAMPLES = '''
|
|||
name: mon.foo
|
||||
style: legacy
|
||||
environment:
|
||||
CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
|
||||
CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
|
||||
'''
|
||||
|
||||
RETURN = '''# '''
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ EXAMPLES = '''
|
|||
cephadm_bootstrap:
|
||||
mon_ip: 192.168.42.1
|
||||
fsid: 3c9ba63a-c7df-4476-a1e7-317dfc711f82
|
||||
image: quay.ceph.io/ceph/daemon-base:latest-master-devel
|
||||
image: quay.io/ceph/daemon-base:latest-main-devel
|
||||
dashboard: false
|
||||
monitoring: false
|
||||
firewalld: false
|
||||
|
|
@ -133,7 +133,7 @@ EXAMPLES = '''
|
|||
cephadm_bootstrap:
|
||||
mon_ip: 192.168.42.1
|
||||
environment:
|
||||
CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
|
||||
CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
|
||||
'''
|
||||
|
||||
RETURN = '''# '''
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
mon_warn_on_pool_no_redundancy: false
|
||||
osd_pool_default_size: 1
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
mon_warn_on_pool_no_redundancy: false
|
||||
osd_pool_default_size: 1
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
mon_warn_on_pool_no_redundancy: false
|
||||
osd_pool_default_size: 1
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
mon_warn_on_pool_no_redundancy: false
|
||||
osd_pool_default_size: 1
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
mon_warn_on_pool_no_redundancy: false
|
||||
osd_pool_default_size: 1
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ ceph_conf_overrides:
|
|||
rgw_override_bucket_index_max_shards: 16
|
||||
rgw_bucket_default_quota_max_objects: 1638400
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -43,6 +43,6 @@ lvm_volumes:
|
|||
data_vg: test_group
|
||||
db: journal1
|
||||
db_vg: journals
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@ handler_health_osd_check_delay: 10
|
|||
mds_max_mds: 2
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ handler_health_osd_check_delay: 10
|
|||
mds_max_mds: 2
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
ceph_docker_registry: quay.io
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
grafana_server_group_name: ceph_monitoring
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ monitor_interface: eth1
|
|||
public_network: "192.168.30.0/24"
|
||||
cluster_network: "192.168.31.0/24"
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon-base
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon-base
|
||||
ceph_docker_image_tag: latest-pacific-devel
|
||||
containerized_deployment: true
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ handler_health_osd_check_delay: 10
|
|||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
dashboard_admin_user_ro: true
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ handler_health_osd_check_delay: 10
|
|||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
dashboard_admin_user_ro: true
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
ceph_docker_registry: quay.io
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
@ -33,10 +33,10 @@ handler_health_mon_check_delay: 10
|
|||
handler_health_osd_check_delay: 10
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ lvm_volumes:
|
|||
db_vg: journals
|
||||
fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
|
||||
generate_fsid: false
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ ceph_conf_overrides:
|
|||
dashboard_enabled: False
|
||||
handler_health_mon_check_delay: 10
|
||||
handler_health_osd_check_delay: 10
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
dashboard_enabled: False
|
||||
handler_health_mon_check_delay: 10
|
||||
handler_health_osd_check_delay: 10
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ ceph_conf_overrides:
|
|||
dashboard_enabled: False
|
||||
handler_health_mon_check_delay: 10
|
||||
handler_health_osd_check_delay: 10
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ openstack_cinder_pool:
|
|||
openstack_pools:
|
||||
- "{{ openstack_glance_pool }}"
|
||||
- "{{ openstack_cinder_pool }}"
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ all:
|
|||
rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true',
|
||||
rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0}
|
||||
cluster: mycluster
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_registry: quay.io
|
||||
cephfs_data_pool:
|
||||
name: 'manila_data'
|
||||
application: "cephfs"
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ handler_health_mon_check_delay: 10
|
|||
handler_health_osd_check_delay: 10
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
mon_max_pg_per_osd: 512
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-main
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
mon_max_pg_per_osd: 512
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-main
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
mon_max_pg_per_osd: 512
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
mon_max_pg_per_osd: 512
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ ceph_conf_overrides:
|
|||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
copy_admin_key: True
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ ceph_conf_overrides:
|
|||
osd_pool_default_size: 1
|
||||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ ceph_conf_overrides:
|
|||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
copy_admin_key: True
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@ ceph_conf_overrides:
|
|||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
copy_admin_key: True
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ ceph_conf_overrides:
|
|||
openstack_config: False
|
||||
dashboard_enabled: False
|
||||
copy_admin_key: True
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ mds_max_mds: 2
|
|||
dashboard_enabled: false
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_registry: quay.io
|
||||
ceph_docker_image: ceph/daemon
|
||||
ceph_docker_image_tag: latest-pacific
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ mds_max_mds: 2
|
|||
dashboard_enabled: false
|
||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||
grafana_admin_password: +xFRe+RES@7vg24n
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
|
||||
ceph_docker_registry: quay.io
|
||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||
grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
|
||||
grafana_server_group_name: ceph_monitoring
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_crush_rule
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_name = 'foo'
|
||||
fake_bucket_root = 'default'
|
||||
fake_bucket_type = 'host'
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ class TestCephKeyModule(object):
|
|||
fake_cluster = "fake"
|
||||
fake_args = ['arg']
|
||||
fake_user = "fake-user"
|
||||
fake_key = "/tmp/my-key"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_user_key = "/tmp/my-key"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = ['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -80,7 +80,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n',
|
||||
"fake-user",
|
||||
'-k',
|
||||
|
|
@ -90,7 +90,7 @@ class TestCephKeyModule(object):
|
|||
'auth',
|
||||
'arg']
|
||||
result = ceph_key.generate_ceph_cmd(
|
||||
fake_cluster, fake_args, fake_user, fake_key, fake_container_image)
|
||||
fake_cluster, fake_args, fake_user, fake_user_key, fake_container_image)
|
||||
assert result == expected_command_list
|
||||
|
||||
def test_generate_ceph_authtool_cmd_non_container_no_auid(self):
|
||||
|
|
@ -134,7 +134,7 @@ class TestCephKeyModule(object):
|
|||
fake_dest = "/fake/ceph"
|
||||
fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
|
||||
fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = ['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -143,7 +143,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'--create-keyring',
|
||||
fake_file_destination,
|
||||
'--name',
|
||||
|
|
@ -202,7 +202,7 @@ class TestCephKeyModule(object):
|
|||
fake_import_key = True
|
||||
fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
|
||||
fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [
|
||||
['docker',
|
||||
'run',
|
||||
|
|
@ -212,7 +212,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'--create-keyring', fake_file_destination,
|
||||
'--name', fake_name,
|
||||
'--add-key', fake_secret,
|
||||
|
|
@ -226,7 +226,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', 'client.admin',
|
||||
'-k', '/etc/ceph/fake.client.admin.keyring',
|
||||
'--cluster', fake_cluster,
|
||||
|
|
@ -289,7 +289,7 @@ class TestCephKeyModule(object):
|
|||
fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
|
||||
fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
|
||||
# create_key passes (one for ceph-authtool and one for itself) itw own array so the expected result is an array within an array # noqa E501
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -298,7 +298,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'--create-keyring',
|
||||
fake_file_destination,
|
||||
'--name',
|
||||
|
|
@ -332,7 +332,7 @@ class TestCephKeyModule(object):
|
|||
fake_user_key = '/etc/ceph/fake.client.admin.keyring'
|
||||
fake_cluster = "fake"
|
||||
fake_name = "client.fake"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -341,7 +341,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', 'client.admin',
|
||||
'-k', '/etc/ceph/fake.client.admin.keyring',
|
||||
'--cluster', fake_cluster,
|
||||
|
|
@ -371,7 +371,7 @@ class TestCephKeyModule(object):
|
|||
fake_name = "client.fake"
|
||||
fake_user = 'client.admin'
|
||||
fake_user_key = '/etc/ceph/fake.client.admin.keyring'
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -380,7 +380,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', fake_user,
|
||||
'-k', fake_user_key,
|
||||
'--cluster', fake_cluster,
|
||||
|
|
@ -406,7 +406,7 @@ class TestCephKeyModule(object):
|
|||
fake_user = 'client.admin'
|
||||
fake_user_key = '/etc/ceph/fake.client.admin.keyring'
|
||||
fake_name = "client.fake"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
fake_dest = "/fake/ceph"
|
||||
fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
|
||||
fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
|
||||
|
|
@ -418,7 +418,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', fake_user,
|
||||
'-k', fake_user_key,
|
||||
'--cluster', fake_cluster,
|
||||
|
|
@ -463,7 +463,7 @@ class TestCephKeyModule(object):
|
|||
fake_user = "mon."
|
||||
fake_keyring_dirname = fake_cluster + "-" + fake_hostname
|
||||
fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring')
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -472,7 +472,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', "mon.",
|
||||
'-k', "/var/lib/ceph/mon/fake-mon01/keyring",
|
||||
'--cluster', fake_cluster,
|
||||
|
|
@ -485,7 +485,7 @@ class TestCephKeyModule(object):
|
|||
fake_cluster = "fake"
|
||||
fake_user = "fake-user"
|
||||
fake_key = "/tmp/my-key"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-luminous"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest-luminous"
|
||||
expected_command_list = [['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
|
@ -494,7 +494,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-luminous',
|
||||
'quay.io/ceph/daemon:latest-luminous',
|
||||
'-n', "fake-user",
|
||||
'-k', "/tmp/my-key",
|
||||
'--cluster', fake_cluster,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_mgr_module
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_module = 'noup'
|
||||
fake_user = 'client.admin'
|
||||
fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_osd
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_id = '42'
|
||||
fake_ids = ['0', '7', '13']
|
||||
fake_user = 'client.admin'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_osd_flag
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_flag = 'noup'
|
||||
fake_user = 'client.admin'
|
||||
fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ fake_user = 'client.admin'
|
|||
fake_user_key = '/etc/ceph/ceph.client.admin.keyring'
|
||||
fake_pool_name = 'foo'
|
||||
fake_cluster_name = 'ceph'
|
||||
fake_container_image_name = 'quay.ceph.io/ceph-ci/daemon:latest-luminous'
|
||||
fake_container_image_name = 'quay.io/ceph/daemon:latest-luminous'
|
||||
|
||||
|
||||
@patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': 'podman'})
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class TestCephVolumeModule(object):
|
|||
|
||||
def test_container_exec(self):
|
||||
fake_binary = "ceph-volume"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + [fake_container_image]
|
||||
result = ceph_volume.container_exec(fake_binary, fake_container_image)
|
||||
assert result == expected_command_list
|
||||
|
|
@ -84,7 +84,7 @@ class TestCephVolumeModule(object):
|
|||
def test_zap_osd_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_module.params = {'data': '/dev/sda'}
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + \
|
||||
[fake_container_image,
|
||||
'--cluster',
|
||||
|
|
@ -167,7 +167,7 @@ class TestCephVolumeModule(object):
|
|||
def test_list_osd_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_module.params = {'cluster': 'ceph', 'data': '/dev/sda'}
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd(
|
||||
{
|
||||
'/var/lib/ceph': '/var/lib/ceph:ro'
|
||||
|
|
@ -196,7 +196,7 @@ class TestCephVolumeModule(object):
|
|||
|
||||
def test_list_storage_inventory_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + \
|
||||
[fake_container_image,
|
||||
'--cluster',
|
||||
|
|
@ -214,7 +214,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph', }
|
||||
|
||||
fake_action = "create"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + \
|
||||
[fake_container_image,
|
||||
'--cluster',
|
||||
|
|
@ -257,7 +257,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph', }
|
||||
|
||||
fake_action = "prepare"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + \
|
||||
[fake_container_image,
|
||||
'--cluster',
|
||||
|
|
@ -302,7 +302,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph',
|
||||
'batch_devices': ["/dev/sda", "/dev/sdb"]}
|
||||
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
fake_container_image = "quay.io/ceph/daemon:latest"
|
||||
expected_command_list = get_container_cmd() + \
|
||||
[fake_container_image,
|
||||
'--cluster',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_volume_simple_activate
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_id = '42'
|
||||
fake_uuid = '0c4a7eca-0c2a-4c12-beff-08a80f064c52'
|
||||
fake_path = '/etc/ceph/osd/{}-{}.json'.format(fake_id, fake_uuid)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import ceph_volume_simple_scan
|
|||
|
||||
fake_cluster = 'ceph'
|
||||
fake_container_binary = 'podman'
|
||||
fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
|
||||
fake_container_image = 'quay.io/ceph/daemon:latest'
|
||||
fake_path = '/var/lib/ceph/osd/ceph-0'
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import ca_test_common
|
|||
import cephadm_adopt
|
||||
|
||||
fake_cluster = 'ceph'
|
||||
fake_image = 'quay.ceph.io/ceph/daemon-base:latest'
|
||||
fake_image = 'quay.io/ceph/daemon-base:latest'
|
||||
fake_name = 'mon.foo01'
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import ca_test_common
|
|||
import cephadm_bootstrap
|
||||
|
||||
fake_fsid = '0f1e0605-db0b-485c-b366-bd8abaa83f3b'
|
||||
fake_image = 'quay.ceph.io/ceph/daemon-base:latest-master-devel'
|
||||
fake_image = 'quay.io/ceph/daemon-base:latest-pacific-devel'
|
||||
fake_ip = '192.168.42.1'
|
||||
fake_registry = 'quay.ceph.io'
|
||||
fake_registry = 'quay.io'
|
||||
fake_registry_user = 'foo'
|
||||
fake_registry_pass = 'bar'
|
||||
fake_registry_json = 'registry.json'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-container-cephadm
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
pip
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-container-docker_to_podman
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
pip
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-external_clients
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
git
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-filestore_to_bluestore
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
git
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-container-podman
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
pip
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ commands=
|
|||
"
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
passenv=*
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-subset_update
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
git
|
||||
|
|
@ -44,8 +44,8 @@ commands=
|
|||
# deploy the cluster
|
||||
bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
ceph_docker_registry=quay.ceph.io \
|
||||
ceph_docker_image=ceph-ci/daemon \
|
||||
ceph_docker_registry=quay.io \
|
||||
ceph_docker_image=ceph/daemon \
|
||||
ceph_docker_image_tag=latest-octopus \
|
||||
ceph_docker_registry_auth=True \
|
||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ envlist = centos-{container,non_container}-update
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
git
|
||||
|
|
@ -50,8 +50,8 @@ commands=
|
|||
# When rendering the ganesha.conf.j2 template, it complains because of undefined variables in the block "{% if nfs_obj_gw | bool %}" although we explicitly set this variable to false (see below).
|
||||
bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
ceph_docker_registry_auth=True \
|
||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||
|
|
|
|||
22
tox.ini
22
tox.ini
|
|
@ -8,7 +8,7 @@ skipsdist = True
|
|||
|
||||
# a test scenario for the lv-create.yml and lv-teardown playbooks
|
||||
[testenv:infra_lv_create]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
mkdir
|
||||
|
|
@ -43,16 +43,16 @@ commands=
|
|||
[purge]
|
||||
commands=
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
|
||||
"
|
||||
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
remove_packages=yes \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
|
||||
"
|
||||
|
||||
|
|
@ -72,8 +72,8 @@ commands=
|
|||
commands=
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/purge-dashboard.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-pacific} \
|
||||
"
|
||||
|
||||
|
|
@ -149,8 +149,8 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
ceph_docker_image_tag=latest-pacific-devel \
|
||||
ceph_docker_registry=quay.ceph.io \
|
||||
ceph_docker_image=ceph-ci/daemon \
|
||||
ceph_docker_registry=quay.io \
|
||||
ceph_docker_image=ceph/daemon \
|
||||
ceph_docker_registry_auth=True \
|
||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
@ -259,7 +259,7 @@ commands=
|
|||
"
|
||||
|
||||
[testenv]
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
vagrant
|
||||
bash
|
||||
pip
|
||||
|
|
@ -334,7 +334,7 @@ commands=
|
|||
!lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2'
|
||||
lvm_osds,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit osd2
|
||||
|
||||
rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
|
||||
rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
|
||||
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue