Refactor releng/prototypes/xci to releng-xci/xci in the code

These changes are needed as part of migrating xci from releng repo to the releng-xci repo.
They cover:
- README updates
- Re-point configuration from releng/prototypes to releng-xci

The changes have been tested as follows:
- XCI_FLAVOR=aio
- OPENSTACK_OSA_VERSION=adfaa66d6108f87599e0595591b39cad2c8fb658
xci: aio has been installed

real    107m5.310s
user    11m50.180s
sys     4m11.152s
ubuntu@rack-IRA2-SymKloudBlade4:~/releng-xci/xci$

Change-Id: I8fd86c2442ee3a7c6996eedb6510dbc6eebd30b0
Signed-off-by: Dave Urschatz <dave.urschatz@cengn.ca>

2 files changed, 15 insertions, 15 deletions

diff --git a/puppet-infracloud/README.md b/puppet-infracloud/README.md
index 37d575c3..7ebce3d0 100644
--- a/puppet-infracloud/README.md
+++ b/puppet-infracloud/README.md
@@ -5,31 +5,31 @@ The manifest and mmodules defined on this repo will deploy an OpenStack cloud ba
 
 Once all the hardware is provisioned, enter in controller and compute nodes and follow these steps:
 
-1. Clone releng::
+1. Clone releng-xci::
 
-    git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
+    git clone https://gerrit.opnfv.org/gerrit/releng-xci /opt/releng-xci
 
 2. Copy hiera to the right place::
 
-    cp /opt/releng/prototypes/puppet-infracloud/hiera/common.yaml /var/lib/hiera
+    cp /opt/puppet-infracloud/hiera/common.yaml /var/lib/hiera
 
 3. Install modules::
 
-    cd /opt/releng/prototypes/puppet-infracloud
+    cd /opt/puppet-infracloud
     ./install_modules.sh
 
 4. Apply the infracloud manifest::
 
-    cd /opt/releng/prototypes/puppet-infracloud
-    puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules
+    cd /opt/puppet-infracloud
+    puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/puppet-infracloud/modules
 
 5. Once you finish this operation on controller and compute nodes, you will have a functional OpenStack cloud.
 
 In jumphost, follow that steps:
 
-1. Clone releng::
+1. Clone releng-xci::
 
-    git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
+    git clone https://gerrit.opnfv.org/gerrit/releng-xci /opt/releng-xci
 
 2. Create OpenStack clouds config directory::
 
@@ -37,7 +37,7 @@ In jumphost, follow that steps:
 
 3. Copy credentials file::
 
-    cp /opt/releng/prototypes/puppet-infracloud/creds/clouds.yaml /root/.config/openstack/
+    cp /opt/puppet-infracloud/creds/clouds.yaml /root/.config/openstack/
 
 4. Install python-dev package as the installation of python-openstackclient depends on it
 
diff --git a/puppet-infracloud/deploy_on_baremetal.md b/puppet-infracloud/deploy_on_baremetal.md
index 2bd0a530..8efa5af7 100644
--- a/puppet-infracloud/deploy_on_baremetal.md
+++ b/puppet-infracloud/deploy_on_baremetal.md
@@ -10,12 +10,12 @@ Please follow documentation on: [https://git.openstack.org/cgit/openstack/bifros
 Once the **baremetal** VM is finished, you can login by ssh and start installing bifrost there. To proceed, follow this steps:
 
  1. Change to root user, install git
- 2. Clone releng project (cd /opt, git clone https://gerrit.opnfv.org/gerrit/releng)
- 3. cd /opt/releng/prototypes/puppet-infracloud
+ 2. Clone releng-xci project (cd /opt, git clone https://gerrit.opnfv.org/gerrit/releng-xci)
+ 3. cd /opt/puppet-infracloud
  4. Copy hiera to the right folder (cp hiera/common_baremetal.yaml /var/lib/hiera/common.yaml)
  5. Ensure hostname is properly set ( hostnamectl set-hostname baremetal.opnfvlocal , hostname -f )
  6. Install puppet and modules ( ./install_puppet.sh , ./install_modules.sh )
- 7. Apply puppet to install bifrost (puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules)
+ 7. Apply puppet to install bifrost (puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/puppet-infracloud/modules)
 
  With these steps you will have a bifrost controller up and running.
 
@@ -43,15 +43,15 @@ Once all the servers are on **active** state, they can be accessed by ssh and In
 On each of those, follow that steps:
 
  1. ssh from the bifrost controller to their external ips: ssh root@172.30.13.90
- 2. cd /opt, clone releng project (git clone https://gerrit.opnfv.org/gerrit/releng)
+ 2. cd /opt, clone releng-xci project (git clone https://gerrit.opnfv.org/gerrit/releng-xci)
  3. Copy hiera to the right folder ( cp hiera/common_baremetal.yaml /var/lib/hiera/common.yaml)
  4. Install modules: ./install_modules.sh
- 5. Apply puppet: puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules
+ 5. Apply puppet: puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/puppet-infracloud/modules
 
 Once this has been done on controller and compute, you will have a working cloud. To start working with it, follow that steps:
 
  1. Ensure that controller00.opnfvlocal resolves properly to the external IP (this is already done in the bifrost controller)
- 2. Copy releng/prototypes/puppet-infracloud/creds/clouds.yaml to $HOME/.config/openstack/clouds.yaml
+ 2. Copy releng-xci/puppet-infracloud/creds/clouds.yaml to $HOME/.config/openstack/clouds.yaml
  3. Install python-openstackclient
  4. Specify the cloud you want to use: export OS_CLOUD=opnfvlocal
  5. Now you can start operating in your cloud with openstack-client: openstack flavor list