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
2016-07-22 07:40:40 -04:00
parent 2c6857b7a3
commit b32b5d56ac
15 changed files with 15 additions and 15 deletions
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@@ -47,7 +47,7 @@
  roles:
    - role: "os_aodh"
      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:
        - "os-aodh"
    - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -40,7 +40,7 @@
  roles:
    - role: "os_ceilometer"
      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:
        - "os-ceilometer"
    - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -124,7 +124,7 @@
  roles:
    - role: "os_cinder"
      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_glance_host: "{{ internal_lb_vip_address }}"
      cinder_glance_service_port: "{{ glance_service_port }}"
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -54,7 +54,7 @@
  roles:
    - role: "os_glance"
      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:
        - "os-glance"
    - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@@ -42,7 +42,7 @@
  roles:
    - role: "os_gnocchi"
      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 }}"
      tags:
        - "os-gnocchi"
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -47,7 +47,7 @@
  roles:
    - role: "os_heat"
      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:
        - "os-heat"
    - role: "rsyslog_client"
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@@ -39,7 +39,7 @@
  roles:
    - role: "os_horizon"
      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:
        - "os-horizon"
    - role: "rsyslog_client"
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@@ -41,7 +41,7 @@
  roles:
    - role: "os_ironic"
      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:
        - "os-ironic"
    - role: "openstack_openrc"
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -65,7 +65,7 @@
  roles:
    - role: "os_keystone"
      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:
        - "os-keystone"
    - { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@@ -48,7 +48,7 @@
  roles:
    - role: "os_magnum"
      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 }}"
      tags:
        - "os-magnum"
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -91,7 +91,7 @@
  roles:
    - role: "os_neutron"
      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_provider_networks: "{{ _provider_networks }}"
      neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -144,7 +144,7 @@
      nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}"
      nova_management_address: "{{ management_address }}"
      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:
        - "os-nova"
    - role: "ceph_client"
--- a/playbooks/os-swift-install.yml
+++ b/playbooks/os-swift-install.yml
@@ -102,7 +102,7 @@
  roles:
    - role: "os_swift"
      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_replication_address: "{{ replication_address }}"
      swift_do_setup: True
--- a/playbooks/os-swift-setup.yml
+++ b/playbooks/os-swift-setup.yml
@@ -134,7 +134,7 @@
  roles:
    - role: "os_swift"
      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_replication_address: "{{ replication_address }}"
      swift_do_setup: True
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -20,7 +20,7 @@
  user: root
  roles:
    - 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"
      tags:
        - "os-tempest"