Support pulling architecture-tagged venv artifacts

Add support to all os-* for downloading venvs built/tagged with
the corresponding CPU architecture for the node deployed on.

Partially Implements: bp/multi-arch-repo
Depends-On: I31756f8383e6d69d2f80caf6a85c4c5021bfc46d
Change-Id: I045de3ac8b81cadbcb34102f1a2db5bff74c32a6
This commit is contained in:
evansash
2016-07-22 07:40:40 -04:00
committed by Jesse Pretorius (odyssey4me)
parent 2c6857b7a3
commit b32b5d56ac
15 changed files with 15 additions and 15 deletions

View File

@@ -47,7 +47,7 @@
roles: roles:
- role: "os_aodh" - role: "os_aodh"
aodh_venv_tag: "{{ openstack_release }}" aodh_venv_tag: "{{ openstack_release }}"
aodh_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/aodh-{{ openstack_release }}.tgz" aodh_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/aodh-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-aodh" - "os-aodh"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

View File

@@ -40,7 +40,7 @@
roles: roles:
- role: "os_ceilometer" - role: "os_ceilometer"
ceilometer_venv_tag: "{{ openstack_release }}" ceilometer_venv_tag: "{{ openstack_release }}"
ceilometer_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ceilometer-{{ openstack_release }}.tgz" ceilometer_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ceilometer-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-ceilometer" - "os-ceilometer"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

View File

@@ -124,7 +124,7 @@
roles: roles:
- role: "os_cinder" - role: "os_cinder"
cinder_venv_tag: "{{ openstack_release }}" cinder_venv_tag: "{{ openstack_release }}"
cinder_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/cinder-{{ openstack_release }}.tgz" cinder_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/cinder-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
cinder_management_address: "{{ ansible_ssh_host }}" cinder_management_address: "{{ ansible_ssh_host }}"
cinder_glance_host: "{{ internal_lb_vip_address }}" cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}" cinder_glance_service_port: "{{ glance_service_port }}"

View File

@@ -54,7 +54,7 @@
roles: roles:
- role: "os_glance" - role: "os_glance"
glance_venv_tag: "{{ openstack_release }}" glance_venv_tag: "{{ openstack_release }}"
glance_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/glance-{{ openstack_release }}.tgz" glance_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/glance-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-glance" - "os-glance"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

View File

@@ -42,7 +42,7 @@
roles: roles:
- role: "os_gnocchi" - role: "os_gnocchi"
gnocchi_venv_tag: "{{ openstack_release }}" gnocchi_venv_tag: "{{ openstack_release }}"
gnocchi_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/gnocchi-{{ openstack_release }}.tgz" gnocchi_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/gnocchi-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}" pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags: tags:
- "os-gnocchi" - "os-gnocchi"

View File

@@ -47,7 +47,7 @@
roles: roles:
- role: "os_heat" - role: "os_heat"
heat_venv_tag: "{{ openstack_release }}" heat_venv_tag: "{{ openstack_release }}"
heat_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/heat-{{ openstack_release }}.tgz" heat_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/heat-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-heat" - "os-heat"
- role: "rsyslog_client" - role: "rsyslog_client"

View File

@@ -39,7 +39,7 @@
roles: roles:
- role: "os_horizon" - role: "os_horizon"
horizon_venv_tag: "{{ openstack_release }}" horizon_venv_tag: "{{ openstack_release }}"
horizon_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/horizon-{{ openstack_release }}.tgz" horizon_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/horizon-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-horizon" - "os-horizon"
- role: "rsyslog_client" - role: "rsyslog_client"

View File

@@ -41,7 +41,7 @@
roles: roles:
- role: "os_ironic" - role: "os_ironic"
ironic_venv_tag: "{{ openstack_release }}" ironic_venv_tag: "{{ openstack_release }}"
ironic_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ironic-{{ openstack_release }}.tgz" ironic_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ironic-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-ironic" - "os-ironic"
- role: "openstack_openrc" - role: "openstack_openrc"

View File

@@ -65,7 +65,7 @@
roles: roles:
- role: "os_keystone" - role: "os_keystone"
keystone_venv_tag: "{{ openstack_release }}" keystone_venv_tag: "{{ openstack_release }}"
keystone_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/keystone-{{ openstack_release }}.tgz" keystone_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/keystone-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-keystone" - "os-keystone"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] } - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

View File

@@ -48,7 +48,7 @@
roles: roles:
- role: "os_magnum" - role: "os_magnum"
magnum_venv_tag: "{{ openstack_release }}" magnum_venv_tag: "{{ openstack_release }}"
magnum_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/magnum-{{ openstack_release }}.tgz" magnum_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/magnum-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}" pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags: tags:
- "os-magnum" - "os-magnum"

View File

@@ -91,7 +91,7 @@
roles: roles:
- role: "os_neutron" - role: "os_neutron"
neutron_venv_tag: "{{ openstack_release }}" neutron_venv_tag: "{{ openstack_release }}"
neutron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/neutron-{{ openstack_release }}.tgz" neutron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/neutron-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
neutron_overlay_network: "{{ _overlay_network }}" neutron_overlay_network: "{{ _overlay_network }}"
neutron_provider_networks: "{{ _provider_networks }}" neutron_provider_networks: "{{ _provider_networks }}"
neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}" neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"

View File

@@ -144,7 +144,7 @@
nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}" nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}"
nova_management_address: "{{ management_address }}" nova_management_address: "{{ management_address }}"
nova_venv_tag: "{{ openstack_release }}" nova_venv_tag: "{{ openstack_release }}"
nova_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/nova-{{ openstack_release }}.tgz" nova_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/nova-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tags: tags:
- "os-nova" - "os-nova"
- role: "ceph_client" - role: "ceph_client"

View File

@@ -102,7 +102,7 @@
roles: roles:
- role: "os_swift" - role: "os_swift"
swift_venv_tag: "{{ openstack_release }}" swift_venv_tag: "{{ openstack_release }}"
swift_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/swift-{{ openstack_release }}.tgz" swift_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/swift-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
swift_storage_address: "{{ storage_address }}" swift_storage_address: "{{ storage_address }}"
swift_replication_address: "{{ replication_address }}" swift_replication_address: "{{ replication_address }}"
swift_do_setup: True swift_do_setup: True

View File

@@ -134,7 +134,7 @@
roles: roles:
- role: "os_swift" - role: "os_swift"
swift_venv_tag: "{{ openstack_release }}" swift_venv_tag: "{{ openstack_release }}"
swift_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/swift-{{ openstack_release }}.tgz" swift_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/swift-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
swift_storage_address: "{{ storage_address }}" swift_storage_address: "{{ storage_address }}"
swift_replication_address: "{{ replication_address }}" swift_replication_address: "{{ replication_address }}"
swift_do_setup: True swift_do_setup: True

View File

@@ -20,7 +20,7 @@
user: root user: root
roles: roles:
- role: "os_tempest" - role: "os_tempest"
tempest_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/tempest-{{ openstack_release }}.tgz" tempest_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/tempest-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
tempest_git_repo: "{{ openstack_repo_git_url }}/tempest" tempest_git_repo: "{{ openstack_repo_git_url }}/tempest"
tags: tags:
- "os-tempest" - "os-tempest"