Merge pull request #1833 from ceph/dev-repository

Dev repository fixes
pull/1773/merge
Andrew Schoen 2017-08-30 14:27:59 -05:00 committed by GitHub
commit 6ae8219018
1 changed files with 3 additions and 3 deletions

View File

@ -25,10 +25,10 @@
- name: make sure ceph_stable_release is set - name: make sure ceph_stable_release is set
fail: fail:
msg: "make sure ceph_stable_release is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/" msg: "make sure ceph_stable_release ( {{ ceph_stable_release }} ) is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/"
when: when:
- ceph_stable_release == 'dummy' - ceph_stable_release == 'dummy'
- (ceph_repository != 'rhcs' or ceph_repository != 'dev') - ceph_repository not in ['rhcs', 'dev']
tags: tags:
- package-install - package-install
@ -38,7 +38,7 @@
when: when:
- ceph_stable_release not in ceph_release_num - ceph_stable_release not in ceph_release_num
- ceph_origin == 'repository' - ceph_origin == 'repository'
- ceph_repository != 'rhcs' - ceph_repository not in ['rhcs', 'dev']
tags: tags:
- package-install - package-install