]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: remove CEPH_STABLE environment variable
authorAndrew Schoen <aschoen@redhat.com>
Wed, 12 Apr 2017 12:50:41 +0000 (07:50 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 12 Apr 2017 12:50:41 +0000 (07:50 -0500)
I'm removing this because when we use an 'rhcs' scenario then we attempt
to set CEPH_STABLE=false as an environment variable. The issue with that
is because the value is coming from an environment variable it is always
treated as a string and ansible treats that as a boolean True. I plan to
set the ceph_stable value with our rhcs_setup.yml playbook instead of
relying on ---extra-vars and environment variables.

Related ansible issue: https://github.com/ansible/ansible/issues/17193

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
tox.ini

diff --git a/tox.ini b/tox.ini
index 7ac24e1f7608a5a23ae1c752e6d2d1eabb210573..09a414a39540cd41611939acf2dcc1edb33135c2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,6 @@ commands=
      "ceph_dev_branch":"{env:CEPH_DEV_BRANCH:master}",\
      "ceph_dev_sha1":"{env:CEPH_DEV_SHA1:latest}",\
      "ceph_stable_release":"{env:CEPH_STABLE_RELEASE:jewel}",\
-     "ceph_stable":{env:CEPH_STABLE:true}\
     \}'
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars '\
@@ -30,7 +29,6 @@ commands=
      "ceph_dev_branch":"{env:CEPH_DEV_BRANCH:master}",\
      "ceph_dev_sha1":"{env:CEPH_DEV_SHA1:latest}",\
      "ceph_stable_release":"{env:CEPH_STABLE_RELEASE:jewel}",\
-     "ceph_stable":{env:CEPH_STABLE:true}\
     \}'
   # test that the cluster can be redeployed in a healthy state
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
@@ -50,7 +48,6 @@ commands=
       "ceph_dev_branch":"{env:UPDATE_CEPH_DEV_BRANCH:master}",\
       "ceph_dev_sha1":"{env:UPDATE_CEPH_DEV_SHA1:latest}",\
       "ceph_stable_release":"{env:UPDATE_CEPH_STABLE_RELEASE:kraken}",\
-      "ceph_stable":{env:CEPH_STABLE:true}\
     \}'
 
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
@@ -71,7 +68,6 @@ setenv=
   docker_dedicated_journal: PLAYBOOK = site-docker.yml.sample
   docker_dmcrypt_journal_collocation: PLAYBOOK = site-docker.yml.sample
   rhcs: CEPH_RHCS = true
-  rhcs: CEPH_STABLE = false
   jewel: CEPH_STABLE_RELEASE = jewel
   kraken: CEPH_STABLE_RELEASE = kraken
   kraken: UPDATE_CEPH_STABLE_RELEASE = luminous
@@ -118,7 +114,6 @@ commands=
      "ceph_dev_branch":"{env:CEPH_DEV_BRANCH:master}",\
      "ceph_dev_sha1":"{env:CEPH_DEV_SHA1:latest}",\
      "ceph_stable_release":"{env:CEPH_STABLE_RELEASE:jewel}",\
-     "ceph_stable":{env:CEPH_STABLE:true},\
      "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}"\