Merge pull request #2081 from ceph/fix_mgr_upgrade

tests: fix docker_collocation, change jewel upgrade
pull/2082/head
Sébastien Han 2017-10-19 20:53:43 +02:00 committed by GitHub
commit acbdb7f4fe
1 changed files with 2 additions and 1 deletions

View File

@ -127,6 +127,7 @@ setenv=
# only available for ansible >= 2.2
ANSIBLE_STDOUT_CALLBACK = debug
docker_cluster: PLAYBOOK = site-docker.yml.sample
docker_cluster_collocation: PLAYBOOK = site-docker.yml.sample
update_docker_cluster: PLAYBOOK = site-docker.yml.sample
purge_docker_cluster: PLAYBOOK = site-docker.yml.sample
purge_docker_cluster: PURGE_PLAYBOOK = purge-docker-cluster.yml
@ -139,7 +140,7 @@ setenv=
rhcs: CEPH_STABLE_RELEASE = luminous
jewel: CEPH_STABLE_RELEASE = jewel
jewel: CEPH_DOCKER_IMAGE_TAG = tag-build-master-jewel-ubuntu-16.04
jewel: UPDATE_CEPH_STABLE_RELEASE = kraken
jewel: UPDATE_CEPH_STABLE_RELEASE = luminous
luminous: CEPH_STABLE_RELEASE = luminous
luminous: CEPH_DOCKER_IMAGE_TAG = tag-build-master-luminous-ubuntu-16.04
luminous: UPDATE_CEPH_STABLE_RELEASE = luminous