From 28b6c2da9c4138b8f05b673174c7560d6c8efe07 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <ian.cordasco@rackspace.com>
Date: Thu, 15 Jan 2015 11:28:33 -0600
Subject: [PATCH] Use HTTPS when installing from mirror.rackspace.com

SecurityImpact

Closes-bug: 1411331

Change-Id: I78716b737b37feab8b21d6e765a349e4e6724bf6
---
 requirements.txt                                 | 2 +-
 rpc_deployment/inventory/group_vars/all.yml      | 4 ++--
 rpc_deployment/vars/repo_packages/all_common.yml | 2 +-
 scripts/os-ansible-aio-check.sh                  | 2 +-
 scripts/rpc-aio-heat-template.yml                | 2 +-
 scripts/rpc-aio-rax-heat-template.yml            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0432adb808..3ad146fa8f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,4 @@ cloudlib==0.0.8
 pip==1.5.6
 wheel==0.24.0
 setuptools==7.0
-http://mirror.rackspace.com/rackspaceprivatecloud/downloads/ansible-1.6.10.tar.gz
+https://mirror.rackspace.com/rackspaceprivatecloud/downloads/ansible-1.6.10.tar.gz
diff --git a/rpc_deployment/inventory/group_vars/all.yml b/rpc_deployment/inventory/group_vars/all.yml
index d5a21cb1f4..a51c459b88 100644
--- a/rpc_deployment/inventory/group_vars/all.yml
+++ b/rpc_deployment/inventory/group_vars/all.yml
@@ -40,7 +40,7 @@ external_vip_address: "{{ external_lb_vip_address }}"
 
 
 ## URL for the frozen rpc repo
-rpc_repo_url: "http://mirror.rackspace.com/rackspaceprivatecloud"
+rpc_repo_url: "https://mirror.rackspace.com/rackspaceprivatecloud"
 rpc_release: master
 
 ## GPG Keys
@@ -55,7 +55,7 @@ apt_common_repos:
 apt_lxc_common_repos:
   - { repo: "ppa:ubuntu-lxc/stable", state: "present" }
 
-get_pip_url: "http://mirror.rackspace.com/rackspaceprivatecloud/downloads/get-pip.py"
+get_pip_url: "https://mirror.rackspace.com/rackspaceprivatecloud/downloads/get-pip.py"
 
 
 ## Users that will not be created via container_common
diff --git a/rpc_deployment/vars/repo_packages/all_common.yml b/rpc_deployment/vars/repo_packages/all_common.yml
index ceae930924..192506568c 100644
--- a/rpc_deployment/vars/repo_packages/all_common.yml
+++ b/rpc_deployment/vars/repo_packages/all_common.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ## URL for the frozen rpc repo
-rpc_repo_url: "http://mirror.rackspace.com/rackspaceprivatecloud"
+rpc_repo_url: "https://mirror.rackspace.com/rackspaceprivatecloud"
 
 ## GPG Keys
 gpg_keys:
diff --git a/scripts/os-ansible-aio-check.sh b/scripts/os-ansible-aio-check.sh
index 396c065759..81e6c248bf 100755
--- a/scripts/os-ansible-aio-check.sh
+++ b/scripts/os-ansible-aio-check.sh
@@ -18,7 +18,7 @@
 set -e -u -v -x
 
 ## Vars
-FROZEN_REPO_URL=${FROZEN_REPO_URL:-"http://mirror.rackspace.com/rackspaceprivatecloud"}
+FROZEN_REPO_URL=${FROZEN_REPO_URL:-"https://mirror.rackspace.com/rackspaceprivatecloud"}
 MAX_RETRIES=${MAX_RETRIES:-5}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secrete"}
 DEPLOY_SWIFT=${DEPLOY_SWIFT:-"yes"}
diff --git a/scripts/rpc-aio-heat-template.yml b/scripts/rpc-aio-heat-template.yml
index 77693bf8e8..dc47e56080 100644
--- a/scripts/rpc-aio-heat-template.yml
+++ b/scripts/rpc-aio-heat-template.yml
@@ -34,7 +34,7 @@ parameters:
     description: The aio script installation URL
   frozen_repo_url:
     type: string
-    default: http://mirror.rackspace.com/rackspaceprivatecloud
+    default: https://mirror.rackspace.com/rackspaceprivatecloud
     description: URL to the frozen
   repo_url:
     type: string
diff --git a/scripts/rpc-aio-rax-heat-template.yml b/scripts/rpc-aio-rax-heat-template.yml
index 41e00c07db..37b04a93ee 100644
--- a/scripts/rpc-aio-rax-heat-template.yml
+++ b/scripts/rpc-aio-rax-heat-template.yml
@@ -34,7 +34,7 @@ parameters:
     description: The aio script installation URL
   frozen_repo_url:
     type: string
-    default: http://mirror.rackspace.com/rackspaceprivatecloud
+    default: https://mirror.rackspace.com/rackspaceprivatecloud
     description: URL to the frozen
   repo_url:
     type: string