Move pip_lock_to_internal_repo to group_vars
The pip_lock_to_internal_repo variable is repeated in most playbooks, move it to all's group vars instead. The repo_all group and lxc_hosts play are exceptions, overriding it to False. Change-Id: I65393b74ed00d3348424e06f4f2fd4b4687cb8d6
This commit is contained in:
parent
a613ebf26c
commit
abec787add
@ -43,7 +43,6 @@
|
||||
user: root
|
||||
roles:
|
||||
- role: "pip_install"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
- { role: "galera_server", tags: [ "galera-server" ] }
|
||||
- role: "rsyslog_client"
|
||||
rsyslog_client_log_rotate_file: galera_log_rotate
|
||||
|
@ -41,6 +41,7 @@ pip_packages:
|
||||
|
||||
pip_links:
|
||||
- { name: "openstack_release", link: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/" }
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
||||
## OpenStack source options
|
||||
# URL for the frozen internal openstack repo.
|
||||
|
@ -38,3 +38,5 @@ repo_build_git_bind_mount: "/openstack/{{ inventory_hostname }}{{ repo_build_git
|
||||
# folder/file attributes.
|
||||
repo_service_user_name: nginx
|
||||
repo_service_group_name: www-data
|
||||
|
||||
pip_lock_to_internal_repo: False
|
||||
|
@ -48,3 +48,5 @@
|
||||
tags:
|
||||
- "lxc-rsyslog-client"
|
||||
- "rsyslog-client"
|
||||
vars:
|
||||
pip_lock_to_internal_repo: False
|
||||
|
@ -65,4 +65,3 @@
|
||||
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 }}"
|
||||
|
@ -53,4 +53,3 @@
|
||||
- "ceilometer-rsyslog-client"
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -165,4 +165,3 @@
|
||||
cinder_galera_user: cinder
|
||||
cinder_galera_database: cinder
|
||||
cinder_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -93,4 +93,3 @@
|
||||
glance_galera_user: glance
|
||||
glance_galera_database: glance
|
||||
glance_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -43,7 +43,6 @@
|
||||
- role: "os_gnocchi"
|
||||
gnocchi_venv_tag: "{{ openstack_release }}"
|
||||
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"
|
||||
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
|
||||
|
@ -78,6 +78,5 @@
|
||||
heat_galera_user: heat
|
||||
heat_galera_database: heat
|
||||
heat_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
vars_files:
|
||||
- defaults/repo_packages/openstack_services.yml
|
||||
|
@ -57,4 +57,3 @@
|
||||
horizon_galera_user: horizon
|
||||
horizon_galera_database: horizon
|
||||
horizon_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -63,4 +63,3 @@
|
||||
ironic_galera_user: ironic
|
||||
ironic_galera_database: ironic
|
||||
ironic_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -98,4 +98,3 @@
|
||||
keystone_galera_user: keystone
|
||||
keystone_galera_database: keystone
|
||||
keystone_galera_address: "{{ galera_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -132,4 +132,3 @@
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
bind_prefix: "{{ provider_network_bind_prefix|default('') }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -191,4 +191,3 @@
|
||||
nova_galera_address: "{{ galera_address }}"
|
||||
nova_api_galera_address: "{{ galera_address }}"
|
||||
glance_host: "{{ internal_lb_vip_address }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -111,7 +111,6 @@
|
||||
- "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
|
||||
|
@ -155,4 +155,3 @@
|
||||
- "system-crontab-coordination"
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -29,4 +29,3 @@
|
||||
- "os-swift-sync"
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
|
@ -40,4 +40,3 @@
|
||||
# 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 }}"
|
||||
|
@ -37,7 +37,6 @@
|
||||
roles:
|
||||
- { role: "galera_client", tags: [ "utility-galera-client" ] }
|
||||
- role: "pip_install"
|
||||
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
tags:
|
||||
- utility-pip-lock-down
|
||||
- { role: "openstack_openrc", tags: [ "utility-openstack-openrc" ] }
|
||||
|
Loading…
Reference in New Issue
Block a user