Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASC-1655 Enable Ceph Scenario #3485

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ASC-1655 Enable Ceph Scenario #3485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1fe516
ASC-1655 Enable Ceph Scenario
ryan-rs Feb 19, 2019
66ad733
Update tests
Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions gating/mnaio_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ if [[ "${RPCO_IMAGES_AVAILABLE}" == "false" ]] || [[ "${RE_JOB_ACTION}" == "depl
export DEPLOY_VMS="true"
fi

# Enable Ceph deployment if specified by the job scenario.
if [[ "${RE_JOB_SCENARIO}" == "ceph" ]] ]]; then
export ENABLE_CEPH_STORAGE="true"
fi

#
# Non-MNAIO RPC Specific settings
#
Expand Down Expand Up @@ -95,6 +100,7 @@ function run_mnaio_playbook() {
-e container_tech=${CONTAINER_TECH:-"lxc"} \
-e ipxe_kernel_base_url=${IPXE_KERNEL_BASE_URL:-"http://boot.ipxe.org"} \
-e ipxe_path_url=${IPXE_PATH_URL:-""} ${MNAIO_ANSIBLE_PARAMETERS} \
-e enable_ceph_storage=${ENABLE_CEPH_STORAGE:-"false"} \
--force-handlers \
--flush-cache \
$@
Expand Down
13 changes: 7 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ setenv =
# NOTE(cloudnull): This should be set to "master" as soon the gate is capable of
# setting this option.
OSA_RELEASE_BRANCH={env:OSA_RELEASE_BRANCH:master}
OSA_TEST_RELEASE=master
UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_TEST_RELEASE:master}
OSA_TEST_RELEASE=d90acf00b639496cd0669153534fe5588875f3ee
OSA_UPPER_CONSTRAINTS=377fde64ac16dc94da2e29e16a4102adcc081a6e
UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_UPPER_CONSTRAINTS:master}
OSA_TEST_DEPS=https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h={env:OSA_TEST_RELEASE:master}
OSA_ROLE_REQUIREMENTS=https://git.openstack.org/cgit/openstack/openstack-ansible/plain/ansible-role-requirements.yml?h={env:OSA_RELEASE_BRANCH:master}
basepython = python2.7
Expand Down Expand Up @@ -87,10 +88,10 @@ commands =
commands =
bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
pushd {toxinidir}/tests/common; \
git checkout {env:OSA_TEST_RELEASE:master}; \
popd; \
fi"
fi; \
pushd {toxinidir}/tests/common; \
git checkout {env:OSA_TEST_RELEASE:master}; \
popd"


[testenv:pep8]
Expand Down