From 7546d75513409a285a4cb925c5431feec5cd3650 Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Tue, 28 Jun 2016 10:55:23 +0200
Subject: [PATCH] Update reviews for ccp and fix missing script

---
 Vagrantfile                         |  1 +
 ccp/ccp-pull.sh                     | 12 ------------
 vagrant-scripts/bootstrap-master.sh |  1 +
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 93471155f..85e700cb3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -91,6 +91,7 @@ Vagrant.configure("2") do |config|
       config.vm.provision "file", source: "ssh", destination: "~/ssh"
       if master
         config.vm.provision "deploy-k8s", type: "file", source: "deploy-k8s.kargo.sh", destination: "~/deploy-k8s.kargo.sh"
+        config.vm.provision "deploy-ccp", type: "file", source: "deploy-ccp.sh", destination: "~/deploy-ccp.sh"
         config.vm.provision "custom.yaml", type: "file", source: "custom.yaml", destination: "~/custom.yaml"
         config.vm.provision "playbooks", type: "file", source: "playbooks", destination: "~/playbooks"
         config.vm.provision "nodes", type: "file", source: "nodes", destination: "~/nodes"
diff --git a/ccp/ccp-pull.sh b/ccp/ccp-pull.sh
index 7016b80c6..7b72369c5 100755
--- a/ccp/ccp-pull.sh
+++ b/ccp/ccp-pull.sh
@@ -78,18 +78,6 @@ fetch_app_def() {
 
   cd $LOCAL_REPO
 
-  cd ms-mariadb
-  git review -d $mariadb
-  cd -
-  cd ms-keystone
-  git review -d $keystone
-  cd -
-  cd ms-memcached
-  git review -d $memcached
-  cd -
-  cd ms-rabbitmq
-  git review -d $rabbitmq
-  cd -
   cd ms-horizon
   git review -d $horizon
   cd -
diff --git a/vagrant-scripts/bootstrap-master.sh b/vagrant-scripts/bootstrap-master.sh
index cdee742c9..cfe3a86c3 100755
--- a/vagrant-scripts/bootstrap-master.sh
+++ b/vagrant-scripts/bootstrap-master.sh
@@ -15,6 +15,7 @@ sudo sh -c 'cd /root/kargo-cli && python setup.py install'
 
 # k8s deploy script and configs
 sudo sh -c 'cp -a ~vagrant/deploy-k8s.kargo.sh /root/ && chmod 755 /root/deploy-k8s.kargo.sh'
+sudo sh -c 'cp -a ~vagrant/deploy-ccp.sh /root/ && chmod 755 /root/deploy-ccp.sh'
 sudo cp -a ~vagrant/custom.yaml /root/custom.yaml
 sudo cp -a ~vagrant/playbooks /root/playbooks
 sudo cp -a ~vagrant/ccp /root/ccp