openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Respect defined version and source of mcapi driver"

Browse Source
This commit is contained in:
Zuul 2025-03-22 09:50:23 +00:00 committed by Gerrit Code Review
commit ad0ff28110
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mcapi_vexxhost/playbooks/files/openstack_deploy/group_vars/magnum_all/main.yml
View File

@ -14,10 +14,11 @@
# limitations under the License.
magnum_magnum_cluster_api_git_install_branch: v0.24.2
magnum_magnum_cluster_api_git_repo: "{{ openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api' }}"
# install magnum-cluster-api and kubernetes python package into magnum venv
magnum_user_pip_packages:
- "git+https://github.com/vexxhost/magnum-cluster-api@{{ magnum_magnum_cluster_api_git_install_branch }}#egg=magnum-cluster-api"
- "git+{{ magnum_magnum_cluster_api_git_repo }}@{{ magnum_magnum_cluster_api_git_install_branch }}#egg=magnum-cluster-api"
- kubernetes
# ensure that the internal VIP CA is trusted by the CAPI driver

8
mcapi_vexxhost/roles/proxy/defaults/main.yml
View File

@ -18,9 +18,9 @@ mcapi_vexxhost_proxy_upper_constraints_url: >-
macpi_vexxhost_proxy_git_constraints:
- "--constraint {{ mcapi_vexxhost_proxy_upper_constraints_url }}"
mcapi_vexxhost_proxy_install_branch: main
mcapi_vexxhost_proxy_git_repo: "{{ openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api' }}"
mcapi_vexxhost_proxy_install_branch: "{{ magnum_magnum_cluster_api_git_install_branch | default('main') }}"
mcapi_vexxhost_proxy_git_repo: >-
{{ magnum_magnum_cluster_api_git_repo | default(openstack_github_base_url | default('https://github.com') ~ '/vexxhost/magnum-cluster-api') }}
mcapi_vexxhost_proxy_pip_packages:
- "{{ 'git+' ~ mcapi_vexxhost_proxy_git_repo ~ '@' ~ mcapi_vexxhost_proxy_install_branch ~ '#egg=magnum-cluster-api' }}"
- "{{ 'git+' ~ mcapi_vexxhost_proxy_git_repo ~ '@' ~ mcapi_vexxhost_proxy_install_branch ~ '#egg=magnum-cluster-api' }}"