diff --git a/.zuul.yaml b/.zuul.yaml index d8b12dfec..5f3e1293e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,8 +10,8 @@ required-projects: - openstack-infra/shade - openstack/keystoneauth + - openstack/openstacksdk - openstack/os-client-config - - openstack/python-openstacksdk - job: name: openstacksdk-tox-py35-tips @@ -25,8 +25,8 @@ required-projects: - openstack-infra/shade - openstack/keystoneauth + - openstack/openstacksdk - openstack/os-client-config - - openstack/python-openstacksdk - project-template: name: openstacksdk-tox-tips @@ -52,7 +52,7 @@ # things. - name: openstack-infra/shade override-branch: master - - name: openstack/python-openstacksdk + - name: openstack/openstacksdk override-branch: master - name: openstack/os-client-config override-branch: master @@ -84,7 +84,7 @@ OPENSTACKSDK_HAS_SWIFT: 1 tox_install_siblings: false tox_envlist: functional - zuul_work_dir: src/git.openstack.org/openstack/python-openstacksdk + zuul_work_dir: src/git.openstack.org/openstack/openstacksdk - job: name: openstacksdk-functional-devstack-legacy @@ -155,8 +155,8 @@ required-projects: - openstack-infra/shade - openstack/keystoneauth + - openstack/openstacksdk - openstack/os-client-config - - openstack/python-openstacksdk vars: tox_install_siblings: true diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 4a710af2f..0aacd6070 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -3,18 +3,18 @@ # To enable openstacksdk in devstack add an entry to local.conf that looks like # # [[local|localrc]] -# enable_plugin openstacksdk git://git.openstack.org/openstack/python-openstacksdk +# enable_plugin openstacksdk https://git.openstack.org/openstack/openstacksdk function preinstall_openstacksdk { : } function install_openstacksdk { - if use_library_from_git "python-openstacksdk"; then + if use_library_from_git "openstacksdk"; then # don't clone, it'll be done by the plugin install - setup_dev_lib "python-openstacksdk" + setup_dev_lib "openstacksdk" else - pip_install "python-openstacksdk" + pip_install "openstacksdk" fi }