diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index 5811c30992..55a7318dfb 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -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 diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 01bc0e77fe..c7240b1275 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -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. diff --git a/playbooks/inventory/group_vars/repo_all.yml b/playbooks/inventory/group_vars/repo_all.yml index 2ad20fce5d..c76a7eceb3 100644 --- a/playbooks/inventory/group_vars/repo_all.yml +++ b/playbooks/inventory/group_vars/repo_all.yml @@ -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 diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index 08068d83aa..aface43504 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -48,3 +48,5 @@ tags: - "lxc-rsyslog-client" - "rsyslog-client" + vars: + pip_lock_to_internal_repo: False diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index ee5cd54b9a..953c9ea66e 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -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 }}" diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 08e149ff4e..ec6ace1ae8 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -53,4 +53,3 @@ - "ceilometer-rsyslog-client" vars: is_metal: "{{ properties.is_metal|default(false) }}" - pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}" diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index d3d876ac8f..8dfb1abb01 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -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 }}" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 304161e95f..7200ec8b89 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -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 }}" diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index 0296ad0b06..3d86dc3b38 100644 --- a/playbooks/os-gnocchi-install.yml +++ b/playbooks/os-gnocchi-install.yml @@ -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" ] } diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 9ffe025727..8e0972fef6 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 2988e04bbf..5763325bc1 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.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 }}" diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index a717768a26..660d2acdff 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -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 }}" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index c023ec7347..78a3f961e5 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -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 }}" diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 1cddfbcd01..a164c935b1 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -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 }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index ca45125001..5d249c9488 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -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 }}" diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index c013ad5533..a09d54613b 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -121,7 +121,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 diff --git a/playbooks/os-swift-setup.yml b/playbooks/os-swift-setup.yml index ceaa1bbf9e..f48f714c9d 100644 --- a/playbooks/os-swift-setup.yml +++ b/playbooks/os-swift-setup.yml @@ -155,4 +155,3 @@ - "system-crontab-coordination" vars: is_metal: "{{ properties.is_metal|default(false) }}" - pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}" diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index 2409589ad3..11bda79bce 100644 --- a/playbooks/os-swift-sync.yml +++ b/playbooks/os-swift-sync.yml @@ -29,4 +29,3 @@ - "os-swift-sync" vars: is_metal: "{{ properties.is_metal|default(false) }}" - pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}" diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 17b62d8fbc..5c6912eded 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -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 }}" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index 43f5dd3d6d..a09434b2a5 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -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" ] }