openstack/openstack-ansible
Code Issues Proposed changes

Make pip_lock_to_internal_repo a playbook var

Browse Source 
When scoping pip_lock_to_internal_repo to each os_* role it was not
being applied correctly to the pip_install dependency of those roles.

Move pip_lock_to_internal_repo to the list of playbook scoped variables
so that the pip lockdown tasks are run as expected.

Change-Id: Ibd4f312b9b3174987b8bd319b3d5f15c397ec4a2
This commit is contained in:
Jimmy McCrory 2016-06-24 13:37:53 -07:00
parent 141a7ad400
commit 912de0f465
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/os-aodh-install.yml
View File

@ -124,7 +124,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-aodh"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -144,3 +143,4 @@
aodh_rabbitmq_servers: "{{ rabbitmq_servers }}"
aodh_rabbitmq_port: "{{ rabbitmq_port }}"
aodh_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-ceilometer-install.yml
View File

@ -103,7 +103,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-ceilometer"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -120,3 +119,4 @@
ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}"
ceilometer_rabbitmq_port: "{{ rabbitmq_port }}"
ceilometer_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-cinder-install.yml
View File

@ -219,7 +219,6 @@
cinder_management_address: "{{ ansible_ssh_host }}"
cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-cinder"
- role: "ceph_client"
@ -250,3 +249,4 @@
cinder_rabbitmq_servers: "{{ rabbitmq_servers }}"
cinder_rabbitmq_port: "{{ rabbitmq_port }}"
cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-glance-install.yml
View File

@ -152,7 +152,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-glance"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -184,3 +183,4 @@
glance_rabbitmq_servers: "{{ rabbitmq_servers }}"
glance_rabbitmq_port: "{{ rabbitmq_port }}"
glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-heat-install.yml
View File

@ -135,7 +135,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-heat"
- role: "rsyslog_client"
@ -159,5 +158,6 @@
heat_rabbitmq_servers: "{{ rabbitmq_servers }}"
heat_rabbitmq_port: "{{ rabbitmq_port }}"
heat_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
vars_files:
- defaults/repo_packages/openstack_services.yml

2
playbooks/os-horizon-install.yml
View File

@ -109,7 +109,6 @@
horizon_server_name: "{{ container_name }}"
horizon_venv_tag: "{{ openstack_release }}"
horizon_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/horizon-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-horizon"
- role: "rsyslog_client"
@ -128,3 +127,4 @@
horizon_galera_user: horizon
horizon_galera_database: horizon
horizon_galera_address: "{{ galera_address }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-ironic-install.yml
View File

@ -111,7 +111,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-ironic"
- role: "openstack_openrc"
@ -133,3 +132,4 @@
ironic_galera_user: ironic
ironic_galera_database: ironic
ironic_galera_address: "{{ galera_address }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-keystone-install.yml
View File

@ -152,7 +152,6 @@
- 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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-keystone"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -179,3 +178,4 @@
keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
keystone_rabbitmq_port: "{{ rabbitmq_port }}"
keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-neutron-install.yml
View File

@ -189,7 +189,6 @@
neutron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/neutron-{{ openstack_release }}.tgz"
neutron_overlay_network: "{{ _overlay_network }}"
neutron_provider_networks: "{{ _provider_networks }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-neutron"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -219,3 +218,4 @@
neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
neutron_rabbitmq_port: "{{ rabbitmq_port }}"
neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-nova-install.yml
View File

@ -252,7 +252,6 @@
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"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-nova"
- role: "ceph_client"
@ -292,3 +291,4 @@
nova_rabbitmq_servers: "{{ rabbitmq_servers }}"
nova_rabbitmq_port: "{{ rabbitmq_port }}"
nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-swift-install.yml
View File

@ -155,11 +155,11 @@
swift_replication_address: "{{ replication_address }}"
swift_do_setup: True
swift_do_sync: True
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
- name: Installation and setup of Swift
hosts: swift_all

2
playbooks/os-swift-setup.yml
View File

@ -139,7 +139,6 @@
swift_replication_address: "{{ replication_address }}"
swift_do_setup: True
swift_do_sync: False
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift"
- role: "rsyslog_client"
@ -156,3 +155,4 @@
- "system-crontab-coordination"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-swift-sync.yml
View File

@ -25,8 +25,8 @@
swift_do_setup: False
swift_do_sync: True
swift_venv_tag: "{{ openstack_release }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift-sync"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"

2
playbooks/os-tempest-install.yml
View File

@ -22,7 +22,6 @@
- role: "os_tempest"
tempest_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/tempest-{{ openstack_release }}.tgz"
tempest_git_repo: "{{ openstack_repo_git_url }}/tempest"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-tempest"
- role: "rsyslog_client"
@ -41,3 +40,4 @@
# This sets the tempest group to the utility group
tempest_main_group: utility_all
is_metal: "{{ properties.is_metal|default(false) }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"