From 0d3cf2463ed54e2217f88f3076c62f05531542a1 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 30 Jul 2020 16:27:53 +0200 Subject: [PATCH] Install openstacksdk from pypi by default It's no longer a fast-moving target and the bits we're using are pretty stable. This saves us one git checkout. Change-Id: Id470b82561e66b5268b3f5209d9ea6432a0d77d0 --- playbooks/roles/bifrost-ironic-install/README.md | 2 +- playbooks/roles/bifrost-ironic-install/defaults/main.yml | 2 +- playbooks/roles/bifrost-prep-for-install/defaults/main.yml | 2 +- releasenotes/notes/sdk-source-1bd77dbd11b08577.yaml | 5 +++++ zuul.d/bifrost-jobs.yaml | 1 - 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/sdk-source-1bd77dbd11b08577.yaml diff --git a/playbooks/roles/bifrost-ironic-install/README.md b/playbooks/roles/bifrost-ironic-install/README.md index 02e9bc597..cb9cc299d 100644 --- a/playbooks/roles/bifrost-ironic-install/README.md +++ b/playbooks/roles/bifrost-ironic-install/README.md @@ -40,7 +40,7 @@ The ironic python client and openstacksdk libraries can be installed directly from Git. The default is to utilize pip to install the current versions in pypi, however testing may require master branch or custom patches. -openstacksdk_source_install: true +openstacksdk_source_install: false Bifrost requires access to the network where nodes are located, in order to provision the nodes. By default, this setting is set to a value for local diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 7e36bb46d..b19760679 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -14,7 +14,7 @@ ironic_tftp_master_path: /var/lib/ironic/master_images staging_drivers_include: false file_url_port: "8080" ironicclient_source_install: false -openstacksdk_source_install: true +openstacksdk_source_install: false ironicinspector_source_install: true ironicinspectorclient_source_install: false sushy_source_install: false diff --git a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml index 3e5494871..97fb3315e 100644 --- a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml +++ b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml @@ -44,7 +44,7 @@ ipa_git_branch: "{{ git_branch }}" ipa_builder_git_branch: master # disable source install to prevent cloning ironicclient_source_install: false -openstacksdk_source_install: true +openstacksdk_source_install: false ironicinspector_source_install: true ironicinspectorclient_source_install: false sushy_source_install: false diff --git a/releasenotes/notes/sdk-source-1bd77dbd11b08577.yaml b/releasenotes/notes/sdk-source-1bd77dbd11b08577.yaml new file mode 100644 index 000000000..ce151fd9e --- /dev/null +++ b/releasenotes/notes/sdk-source-1bd77dbd11b08577.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + OpenStackSDK is now installed from PyPI by default, set + ``openstacksdk_source_install=true`` to override. diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 0d7959678..380326d4f 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -21,7 +21,6 @@ - openstack/ironic-inspector - openstack/ironic-python-agent - openstack/ironic-python-agent-builder - - openstack/openstacksdk - openstack/requirements - x/ironic-staging-drivers