mirror of https://github.com/ceph/ceph-ansible.git
tests: migrate to quay.ceph.io registry
in order to avoid docker.io rate limiting
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 2cbb7de3b2
)
pull/5757/head
parent
8e3ecfd869
commit
218aedaab6
|
@ -30,9 +30,9 @@ The following environent variables are available for use:
|
|||
* ``UPDATE_CEPH_STABLE_RELEASE``: (default: ``kraken``) This would configure the ``ceph-ansible`` variable ``ceph_stable_relese`` during an ``update``
|
||||
scenario. This is set automatically when using the ``jewel-*`` or ``kraken-*`` testing scenarios.
|
||||
|
||||
* ``CEPH_DOCKER_REGISTRY``: (default: ``docker.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
|
||||
* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
|
||||
|
||||
* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
|
||||
* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/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``.
|
||||
|
||||
|
|
|
@ -27,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -29,3 +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-octopus
|
|
@ -43,3 +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-octopus
|
|
@ -42,3 +42,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
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-octopus
|
||||
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"
|
|
@ -35,3 +35,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
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-octopus
|
||||
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"
|
|
@ -3,3 +3,6 @@ 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
|
||||
ceph_docker_image_tag: latest-octopus
|
|
@ -24,3 +24,9 @@ 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_image_tag: latest-octopus
|
||||
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"
|
|
@ -21,3 +21,9 @@ 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_image_tag: latest-octopus
|
||||
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"
|
|
@ -44,3 +44,6 @@ 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_image_tag: latest-octopus
|
|
@ -38,3 +38,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-octopus
|
|
@ -23,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -29,3 +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-octopus
|
|
@ -43,3 +43,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-octopus
|
|
@ -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/daemon
|
||||
ceph_docker_image_tag: latest-master
|
||||
ceph_docker_registry: docker.io
|
||||
ceph_docker_image: ceph-ci/daemon
|
||||
ceph_docker_image_tag: latest-octopus
|
||||
ceph_docker_registry: quay.ceph.io
|
||||
cephfs_data_pool:
|
||||
name: 'manila_data'
|
||||
pg_num: "{{ osd_pool_default_pg_num }}"
|
||||
|
|
|
@ -43,3 +43,6 @@ 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_image_tag: latest-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -27,3 +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-octopus
|
|
@ -17,3 +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-octopus
|
|
@ -16,3 +16,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-octopus
|
|
@ -16,3 +16,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-octopus
|
|
@ -17,3 +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-octopus
|
|
@ -16,3 +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-octopus
|
|
@ -18,3 +18,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-octopus
|
|
@ -93,7 +93,7 @@ class TestCephKeyModule(object):
|
|||
fake_args = ['arg']
|
||||
fake_user = "fake-user"
|
||||
fake_key = "/tmp/my-key"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = ['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -102,7 +102,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n',
|
||||
"fake-user",
|
||||
'-k',
|
||||
|
@ -156,7 +156,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 = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = ['docker',
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -165,7 +165,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'--create-keyring',
|
||||
fake_file_destination,
|
||||
'--name',
|
||||
|
@ -220,7 +220,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 = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [
|
||||
['docker', # noqa E128
|
||||
'run',
|
||||
|
@ -230,7 +230,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'--create-keyring', fake_file_destination,
|
||||
'--name', fake_name,
|
||||
'--add-key', fake_secret,
|
||||
|
@ -244,7 +244,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', 'client.admin',
|
||||
'-k', '/etc/ceph/fake.client.admin.keyring',
|
||||
'--cluster', fake_cluster,
|
||||
|
@ -304,7 +304,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 = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -313,7 +313,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph-authtool',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'--create-keyring',
|
||||
fake_file_destination,
|
||||
'--name',
|
||||
|
@ -343,7 +343,7 @@ class TestCephKeyModule(object):
|
|||
def test_delete_key_container(self):
|
||||
fake_cluster = "fake"
|
||||
fake_name = "client.fake"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -352,7 +352,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', 'client.admin',
|
||||
'-k', '/etc/ceph/fake.client.admin.keyring',
|
||||
'--cluster', fake_cluster,
|
||||
|
@ -382,7 +382,7 @@ class TestCephKeyModule(object):
|
|||
fake_user = "fake-user"
|
||||
fake_key = "/tmp/my-key"
|
||||
fake_output_format = "json"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -391,7 +391,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', "fake-user",
|
||||
'-k', "/tmp/my-key",
|
||||
'--cluster', fake_cluster,
|
||||
|
@ -416,7 +416,7 @@ class TestCephKeyModule(object):
|
|||
def test_get_key_container(self):
|
||||
fake_cluster = "fake"
|
||||
fake_name = "client.fake"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
fake_dest = "/fake/ceph"
|
||||
fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
|
||||
fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
|
||||
|
@ -428,7 +428,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', "client.admin",
|
||||
'-k', "/etc/ceph/fake.client.admin.keyring", # noqa E501
|
||||
'--cluster', fake_cluster,
|
||||
|
@ -472,7 +472,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') # noqa E501
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -481,7 +481,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', "mon.",
|
||||
'-k', "/var/lib/ceph/mon/fake-mon01/keyring", # noqa E501
|
||||
'--cluster', fake_cluster,
|
||||
|
@ -495,7 +495,7 @@ class TestCephKeyModule(object):
|
|||
fake_cluster = "fake"
|
||||
fake_user = "fake-user"
|
||||
fake_key = "/tmp/my-key"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest-luminous"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
|
||||
expected_command_list = [['docker', # noqa E128
|
||||
'run',
|
||||
'--rm',
|
||||
|
@ -504,7 +504,7 @@ class TestCephKeyModule(object):
|
|||
'-v', '/var/lib/ceph/:/var/lib/ceph/:z',
|
||||
'-v', '/var/log/ceph/:/var/log/ceph/:z',
|
||||
'--entrypoint=ceph',
|
||||
'docker.io/ceph/daemon:latest-luminous',
|
||||
'quay.ceph.io/ceph-ci/daemon:latest-octopus',
|
||||
'-n', "fake-user",
|
||||
'-k', "/tmp/my-key",
|
||||
'--cluster', fake_cluster,
|
||||
|
|
|
@ -10,7 +10,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 = 'docker.io/ceph/daemon:latest-luminous'
|
||||
fake_container_image_name = 'quay.ceph.io/ceph-ci/daemon:latest-octopus'
|
||||
|
||||
|
||||
@patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': 'podman'})
|
||||
|
|
|
@ -65,7 +65,7 @@ class TestCephVolumeModule(object):
|
|||
|
||||
def test_container_exec(self):
|
||||
fake_binary = "ceph-volume"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image]
|
||||
result = ceph_volume.container_exec(fake_binary, fake_container_image)
|
||||
assert result == expected_command_list
|
||||
|
@ -73,7 +73,7 @@ class TestCephVolumeModule(object):
|
|||
def test_zap_osd_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_module.params = {'data': '/dev/sda'}
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
@ -140,7 +140,7 @@ class TestCephVolumeModule(object):
|
|||
def test_list_osd_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_module.params = {'cluster': 'ceph', 'data': '/dev/sda'}
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
@ -165,7 +165,7 @@ class TestCephVolumeModule(object):
|
|||
|
||||
def test_list_storage_inventory_container(self):
|
||||
fake_module = MagicMock()
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
@ -182,7 +182,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph', }
|
||||
|
||||
fake_action = "create"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
@ -224,7 +224,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph', }
|
||||
|
||||
fake_action = "prepare"
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
@ -268,7 +268,7 @@ class TestCephVolumeModule(object):
|
|||
'cluster': 'ceph',
|
||||
'batch_devices': ["/dev/sda", "/dev/sdb"]}
|
||||
|
||||
fake_container_image = "docker.io/ceph/daemon:latest"
|
||||
fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest"
|
||||
expected_command_list = container_cmd + [fake_container_image,
|
||||
'--cluster',
|
||||
'ceph',
|
||||
|
|
|
@ -33,9 +33,6 @@ commands=
|
|||
|
||||
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/cephadm.yml --extra-vars "\
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/ceph} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:v15.2} \
|
||||
ceph_docker_registry_auth=True \
|
||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
|
@ -40,9 +40,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -51,9 +48,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/docker-to-podman.yml --extra-vars "\
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
|
||||
|
|
|
@ -43,9 +43,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -60,9 +57,6 @@ commands=
|
|||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \
|
||||
generate_fsid=false \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
|
@ -51,9 +51,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -62,9 +59,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:octopus} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests"
|
||||
|
|
|
@ -43,9 +43,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
|
@ -7,58 +7,34 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=0 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=1 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=2 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=3 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=4 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=5 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=6 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=7 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
[shrink-osd-multiple]
|
||||
|
@ -66,9 +42,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill=0,1,2,3,4,5,6,7 \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
[testenv]
|
||||
|
@ -121,9 +94,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -143,9 +113,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
|
@ -51,9 +51,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -63,9 +60,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
ceph_docker_registry_auth=True \
|
||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
|
59
tox.ini
59
tox.ini
|
@ -113,20 +113,13 @@ commands=
|
|||
# can be redployed to.
|
||||
[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:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml
|
||||
|
||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
remove_packages=yes \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
# re-setup lvm
|
||||
|
@ -136,9 +129,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -153,9 +143,6 @@ commands=
|
|||
remove_packages=yes \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -167,9 +154,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
# test that the cluster can be redeployed in a healthy state
|
||||
py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
|
||||
|
@ -185,9 +169,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
osd_to_kill={env:OSD_TO_KILL:0} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
[shrink-mgr]
|
||||
|
@ -223,9 +204,6 @@ commands=
|
|||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
|
||||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -240,9 +218,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
|
||||
|
||||
|
@ -254,9 +229,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -270,9 +242,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -286,9 +255,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -302,9 +268,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -318,9 +281,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -340,15 +300,12 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
"
|
||||
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}"
|
||||
ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}"
|
||||
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}"
|
||||
ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/rgw_multisite.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_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}"
|
||||
bash -c "cd {changedir}/secondary && vagrant destroy --force"
|
||||
# clean rule after the scenario is complete
|
||||
ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=absent'
|
||||
|
@ -365,9 +322,6 @@ commands=
|
|||
ireallymeanit=yes \
|
||||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
|
||||
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
|
||||
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
|
||||
"
|
||||
|
||||
[testenv]
|
||||
|
@ -451,7 +405,7 @@ commands=
|
|||
# configure lvm
|
||||
!lvm_batch-!lvm_auto_discovery-!ooo_collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
|
||||
|
||||
rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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 "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
|
||||
|
||||
|
@ -459,9 +413,6 @@ commands=
|
|||
delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
|
||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||
ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} \
|
||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.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} \
|
||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||
|
@ -481,7 +432,7 @@ commands=
|
|||
all_daemons: py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
|
||||
|
||||
# handlers/idempotency test
|
||||
all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-octopus}" --extra-vars @ceph-override.json
|
||||
all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-octopus}" --extra-vars @ceph-override.json
|
||||
|
||||
purge: {[purge]commands}
|
||||
switch_to_containers: {[switch-to-containers]commands}
|
||||
|
|
Loading…
Reference in New Issue