diff --git a/.zuul.yaml b/.zuul.yaml index 61b89ea4e..efd99e20d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -74,10 +74,11 @@ parent: nodepool-functional-base run: playbooks/nodepool-functional-py35-src/run.yaml required-projects: - - openstack-infra/glean - - openstack-infra/nodepool - - openstack/diskimage-builder - - openstack/openstacksdk + - name: github.com/sqlalchemy/dogpile.cache + - name: openstack-infra/glean + - name: openstack-infra/nodepool + - name: openstack/diskimage-builder + - name: openstack/openstacksdk - job: name: nodepool-functional-py35-src diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 80fafe7d9..1373b4e6b 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -42,7 +42,6 @@ function install_glean { fi } - function install_openstacksdk { if use_library_from_git "openstacksdk"; then git_clone_by_name "openstacksdk" @@ -50,6 +49,19 @@ function install_openstacksdk { fi } +function install_dogpile_cache { + if use_library_from_git "dogpile.cache"; then + GITREPO["dogpile.cache"]=$DOGPILE_CACHE_REPO_URL + GITDIR["dogpile.cache"]=$DEST/dogpile.cache + GITBRANCH["dogpile.cache"]=$DOGPILE_CACHE_REPO_REF + + + git_clone_by_name "dogpile.cache" + $NODEPOOL_INSTALL/bin/pip install $DEST/dogpile.cache + fi +} + + # Install nodepool code function install_nodepool { VENV="virtualenv -p python3" @@ -64,6 +76,7 @@ function install_nodepool { # in the -src job we don't re-install from the requirement. # We should make this more resilient, probably using install-siblings. install_openstacksdk + install_dogpile_cache $NODEPOOL_INSTALL/bin/pbr freeze } diff --git a/devstack/settings b/devstack/settings index 1308aa1e9..74473e70a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -23,6 +23,9 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master} GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean} GLEAN_REPO_REF=${GLEAN_REPO_REF:-master} +DOGPILE_CACHE_REPO_URL=${DOGPILE_CACHE_REPO_URL:-https://github.com/sqlalchemy/dogpile.git} +DOGPILE_CACHE_REPO_REF=${DOGPILE_CACHE_REPO_REF:-master} + enable_service geard enable_service statsd enable_service nodepool-launcher