From f0b46125d29f49fb8a5566277434a0958fcf0bee Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 24 Aug 2015 08:32:07 +0100
Subject: [PATCH] Remove upstream repo dependency

This patch removes the upstream repo dependency so that
all builds executing setup-infrastructure now execute a
local repository build instead of an rcync clone from
an upstream source.

Change-Id: Idf9beb9ea396d241758d4e970a4f88fef96cdf46
Implements: blueprint remove-upstream-repo-dependency
---
 playbooks/repo-clone-mirror.yml | 44 ---------------------------------
 playbooks/repo-install.yml      |  2 +-
 scripts/run-playbooks.sh        |  5 +---
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 playbooks/repo-clone-mirror.yml

diff --git a/playbooks/repo-clone-mirror.yml b/playbooks/repo-clone-mirror.yml
deleted file mode 100644
index cb3505a0ed..0000000000
--- a/playbooks/repo-clone-mirror.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This play was built to seed an environment with packages that may be used
-# from within the environment as found from a given mirror_source_host.
-# Currently the mirror source host is set to the Rackspace build servers but
-# could be targeted to wherever you'd like.
-- name: Cloning the upstream repo mirror
-  hosts: repo_all[0]
-  max_fail_percentage: 20
-  gather_facts: false
-  user: root
-  tasks:
-    - name: Sync the upstream repo(s)
-      shell: |
-        rsync -avzlHAX \
-              {{ mirror_excludes }} \
-              {{ mirror_source_host }}::{{ mirror_name }} {{ mirror_path }}
-      sudo: yes
-      sudo_user: "{{ repo_service_user_name }}"
-  vars:
-    repo_mirror_excludes:
-      - "/repos"
-      - "/mirror"
-      - "/rpcgit"
-      - "/openstackgit"
-      - "/python_packages"
-    mirror_excludes: "{% for i in repo_mirror_excludes %} --exclude={{ i }} {% endfor %}"
-    mirror_path: "{{ repo_service_home_folder }}/repo"
-    mirror_name: "{{ repo_mirror_name|default('openstack_mirror') }}"
-    mirror_source_host: "{{ repo_mirror_source_host|default('rpc-repo.rackspace.com') }}"
-    is_metal: "{{ properties.is_metal|default(false) }}"
diff --git a/playbooks/repo-install.yml b/playbooks/repo-install.yml
index 3a299ac9d9..ea20df723c 100644
--- a/playbooks/repo-install.yml
+++ b/playbooks/repo-install.yml
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 - include: repo-server.yml
-- include: repo-clone-mirror.yml
+- include: repo-build.yml
diff --git a/scripts/run-playbooks.sh b/scripts/run-playbooks.sh
index 20b39a6032..70a20dc42e 100755
--- a/scripts/run-playbooks.sh
+++ b/scripts/run-playbooks.sh
@@ -136,11 +136,8 @@ pushd "playbooks"
   if [ "${DEPLOY_INFRASTRUCTURE}" == "yes" ]; then
     # Install all of the infra bits
     install_bits memcached-install.yml
+    install_bits repo-install.yml
 
-    # For the purposes of gating the repository of python wheels are built within
-    # the environment. Normal installation would simply clone the upstream mirror.
-    install_bits repo-server.yml
-    install_bits repo-build.yml
     mkdir -p "${COMMAND_LOGS}/repo_data"
     ansible 'repo_all[0]' -m raw \
                           -a 'find  /var/www/repo/os-releases -type l' \