mirror of https://github.com/ceph/ceph-ansible.git
tests: clean legacy
clean some legacies since quay.ceph.io migration Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/5745/head
parent
e65f9a5c72
commit
657e6c8c3b
|
@ -2,4 +2,4 @@
|
||||||
- name: container registry authentication
|
- name: container registry authentication
|
||||||
command: '{{ container_binary }} login -u {{ ceph_docker_registry_username }} -p {{ ceph_docker_registry_password }} {{ ceph_docker_registry }}'
|
command: '{{ container_binary }} login -u {{ ceph_docker_registry_username }} -p {{ ceph_docker_registry_password }} {{ ceph_docker_registry }}'
|
||||||
changed_when: false
|
changed_when: false
|
||||||
no_log: true
|
no_log: true
|
|
@ -35,7 +35,7 @@ handler_health_osd_check_delay: 10
|
||||||
mds_max_mds: 2
|
mds_max_mds: 2
|
||||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||||
grafana_admin_password: +xFRe+RES@7vg24n
|
grafana_admin_password: +xFRe+RES@7vg24n
|
||||||
|
ceph_docker_registry: quay.ceph.io
|
||||||
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
|
||||||
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
|
||||||
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
|
||||||
ceph_docker_registry: quay.ceph.io
|
|
|
@ -20,4 +20,7 @@ handler_health_mon_check_delay: 10
|
||||||
handler_health_osd_check_delay: 10
|
handler_health_osd_check_delay: 10
|
||||||
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
dashboard_admin_password: $sX!cD$rYU6qR^B!
|
||||||
dashboard_admin_user_ro: true
|
dashboard_admin_user_ro: true
|
||||||
grafana_admin_password: +xFRe+RES@7vg24n
|
grafana_admin_password: +xFRe+RES@7vg24n
|
||||||
|
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"
|
|
@ -57,9 +57,6 @@ commands=
|
||||||
fsid=40358a87-ab6e-4bdc-83db-1d909147861c \
|
fsid=40358a87-ab6e-4bdc-83db-1d909147861c \
|
||||||
external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \
|
external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \
|
||||||
generate_fsid=false \
|
generate_fsid=false \
|
||||||
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
|
|
||||||
ceph_docker_image=ceph-ci/daemon \
|
|
||||||
ceph_docker_image_tag=latest-master \
|
|
||||||
ceph_dev_branch=master \
|
ceph_dev_branch=master \
|
||||||
ceph_dev_sha1=latest \
|
ceph_dev_sha1=latest \
|
||||||
ceph_docker_registry_auth=True \
|
ceph_docker_registry_auth=True \
|
||||||
|
|
20
tox.ini
20
tox.ini
|
@ -89,9 +89,6 @@ commands=
|
||||||
# set up the cluster again
|
# set up the cluster again
|
||||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||||
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-master} \
|
|
||||||
ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
|
ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
|
||||||
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
|
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
|
||||||
"
|
"
|
||||||
|
@ -109,9 +106,6 @@ commands=
|
||||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
|
||||||
ireallymeanit=yes \
|
ireallymeanit=yes \
|
||||||
osd_to_kill={env:OSD_TO_KILL:0} \
|
osd_to_kill={env:OSD_TO_KILL:0} \
|
||||||
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-master} \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
[shrink-mgr]
|
[shrink-mgr]
|
||||||
|
@ -147,8 +141,9 @@ commands=
|
||||||
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
|
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
|
||||||
ireallymeanit=yes \
|
ireallymeanit=yes \
|
||||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||||
ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
|
ceph_docker_image_tag=latest-master-devel \
|
||||||
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
|
ceph_docker_registry=quay.ceph.io \
|
||||||
|
ceph_docker_image=ceph-ci/daemon \
|
||||||
ceph_docker_registry_auth=True \
|
ceph_docker_registry_auth=True \
|
||||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
||||||
|
@ -162,9 +157,6 @@ commands=
|
||||||
ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\
|
ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\
|
||||||
ireallymeanit=yes \
|
ireallymeanit=yes \
|
||||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||||
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-master} \
|
|
||||||
ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
|
ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
|
||||||
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
|
ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
|
||||||
"
|
"
|
||||||
|
@ -260,8 +252,8 @@ commands=
|
||||||
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
|
||||||
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
|
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: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 -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.yml
|
||||||
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}"
|
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
|
||||||
bash -c "cd {changedir}/secondary && vagrant destroy --force"
|
bash -c "cd {changedir}/secondary && vagrant destroy --force"
|
||||||
# clean rule after the scenario is complete
|
# 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'
|
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'
|
||||||
|
@ -388,7 +380,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
|
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
|
# 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_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_BIS:latest-bis-master} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --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_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-master} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json
|
||||||
|
|
||||||
purge: {[purge]commands}
|
purge: {[purge]commands}
|
||||||
switch_to_containers: {[switch-to-containers]commands}
|
switch_to_containers: {[switch-to-containers]commands}
|
||||||
|
|
Loading…
Reference in New Issue