From 473881dcae890fd8520f5bb1777e907d6e8f3abd Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 22 May 2015 11:33:35 -0700 Subject: [PATCH] Update for pip 7.0.0 The trusted host option when installing from a domain that is not https is no longer optional. This change adds a domain variable to the groupvars/all.yml and ensures that the get-pip.py installation process is using the `--trusted-host`` flag and is pointed back at the domain name used in the "openstack_upstream_domain". Change-Id: I18539cf4b8790c096d44a0de4985b9d4293d95e3 --- playbooks/inventory/group_vars/all.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index fe6d6ba7fb..42bfa29bb3 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -22,7 +22,7 @@ verbose: True repo_service_user_name: nginx repo_service_home_folder: /var/www repo_server_port: 8181 -repo_pip_default_index: "http://rpc-repo.rackspace.com/pools" +repo_pip_default_index: "http://{{ openstack_upstream_domain }}/pools" ## Rsyslog server @@ -34,7 +34,8 @@ rsyslog_server_storage_directory: /var/log/log-storage openstack_release: master # URL for the frozen internal openstack repo. openstack_repo_url: "http://{{ internal_lb_vip_address }}:{{ repo_server_port }}" -openstack_upstream_url: "http://rpc-repo.rackspace.com" +openstack_upstream_domain: "rpc-repo.rackspace.com" +openstack_upstream_url: "http://{{ openstack_upstream_domain }}" # Global minimum kernel requirement openstack_host_required_kernel: 3.13.0-34-generic @@ -69,7 +70,7 @@ galera_root_user: root ## Pip install # Lock down pip to only a specific version of pip -pip_get_pip_options: "--no-index --find-links={{ openstack_upstream_url }}/os-releases/{{ openstack_release }}" +pip_get_pip_options: "--no-index --find-links={{ openstack_upstream_url }}/os-releases/{{ openstack_release }} --trusted-host {{ openstack_upstream_domain }}" ## Memcached options