Making sure deploy created files are not tracked

Change-Id: I4a9290283c74bde5e7233027f4065a41951c91f6

.gitignore

@@ -22,6 +22,9 @@ lib64
 # Installer logs
 pip-log.txt
 
+# Deploy created
+/Deploy/plabook/deploy
+
 # Unit test / coverage reports
 .coverage
 .tox

Deploy/playbook/cluster_check.yml

@@ -15,7 +15,7 @@
 
 - hosts: storlet-proxy:storlet-storage:docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: test_os_version

Deploy/playbook/create_default_tenant.yml

@@ -15,7 +15,7 @@
 
 - hosts: storlet-mgmt
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: create_default_tenant

Deploy/playbook/deploy_default_tenant.yml

@@ -15,14 +15,14 @@
 
 - hosts: docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: deploy_default_tenant
   
 - hosts: storlet-proxy:storlet-storage
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: pull_default_tenant

Deploy/playbook/docker_base_storlet_images.yml

@@ -15,7 +15,7 @@
 
 - hosts: docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
-  - role: docker_base_jre_image
+  - role: docker_base_jre_image

Deploy/playbook/docker_repository.yml

@@ -15,20 +15,20 @@
 
 - hosts: docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: docker_client
 
 - hosts: docker # TODO: This patch probably needs to propegate to all clients on all nodes. 
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   tasks:
     - include: roles/docker_registry/tasks/patch_docker_configs.yml 
     
 - hosts: docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
   - role: docker_registry

Deploy/playbook/docker_storlet_engine_image.yml

@@ -15,7 +15,7 @@
 
 - hosts: docker
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
-  - role: docker_storlet_engine_image
+  - role: docker_storlet_engine_image

Deploy/playbook/host_storlet_engine.yml

@@ -16,7 +16,7 @@
 - hosts: storlet-proxy:storlet-storage
      
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
 
   roles:
        - role: docker_client                                                

Deploy/playbook/roles/docker_registry/tasks/main.yml

@@ -52,6 +52,9 @@
 - shell: chdir=/opt/docker-registry
          /bin/sed -i '/requests/d' requirements.txt
 
+- shell: chdir=/opt/docker-registry
+         /bin/sed -i '/glanceclient/d' requirements.txt
+
 - name: pip install the Docker repository service requirements
   pip:
     chdir: /opt/docker-registry

Deploy/playbook/set_test_conf.yml

@@ -10,7 +10,7 @@
 
 - hosts: storlet-proxy:storlet-storage
   vars_files:
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   tasks:
     - replace: dest=/etc/swift/proxy-server.conf regexp='^storlet_execute_on_proxy_only.*$' replace='storlet_execute_on_proxy_only = {{ run_on_proxy }}' owner=swift group=swift mode=644
     - replace: dest=/etc/swift/object-server.conf regexp='^storlet_execute_on_proxy_only.*$' replace='storlet_execute_on_proxy_only = {{ run_on_proxy }}' owner=swift group=swift mode=644

Deploy/playbook/storlet_mgmt.yml

@@ -15,7 +15,7 @@
 
 - hosts: storlet-mgmt
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
     
   roles:
 #  - role: docker_client

Deploy/playbook/ustorlet.yml

@@ -15,26 +15,26 @@
 
 - hosts: all
   vars_files: 
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   roles:
     - role: remove_docker
 
 - hosts: storlet-proxy:storlet-storage
   vars_files:
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   roles:
     - role: reconfigure_swift
       engine_install_dir: /tmp/swift/
 
 - hosts: storlet-proxy:storlet-storage
   vars_files:
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   roles:
     - role: remove_host_storlet_engine
 
 - hosts : docker
   vars_files:
-    - [ common.yml ]
+    - [ deploy/common.yml ]
   roles:
     - role: remove_docker_registry
 

tests/setup_functional_test.sh

@@ -28,23 +28,36 @@ sudo sed -i 's/<Set Me!>/'$USER'/g' localhost_config.json
 ansible-playbook -s -i inventory/vagrant/localhost_dynamic_inventory.py main-install.yml
 
 cd -
-sed -i 's/<Set Me!>/127.0.0.1/g' Deploy/playbook/common.yml
+sudo mkdir Deploy/playbook/deploy
-sed -i 's/<Set Me!>/'$USER'/g' Deploy/playbook/hosts
+echo "Copying vars and hosts file to deploy directory"
-sed -i '/ansible_ssh_pass/d' Deploy/playbook/hosts
+sudo cp Deploy/playbook/common.yml-sample Deploy/playbook/deploy/common.yml
+sudo cp Deploy/playbook/hosts-sample Deploy/playbook/deploy/hosts
+sudo chown -R $USER:$USER Deploy/playbook/deploy
+sed -i 's/<Set Me!>/127.0.0.1/g' Deploy/playbook/deploy/common.yml
+sed -i 's/<Set Me!>/'$USER'/g' Deploy/playbook/deploy/hosts
+sed -i '/ansible_ssh_pass/d' Deploy/playbook/deploy/hosts
 # If no arguments are supplied, assume we are under jenkins job, and
 # we need to edit common.yml to set the appropriate source dir
 if [ -z "$1" ]
   then
-    sed -i 's/~\/storlets/\/home\/'$USER'\/workspace\/gate-storlets-functional\//g' Deploy/playbook/common.yml
+    sed -i 's/~\/storlets/\/home\/'$USER'\/workspace\/gate-storlets-functional\//g' Deploy/playbook/deploy/common.yml
 fi
 
 cd Deploy/playbook
-ansible-playbook -s -i hosts cluster_check.yml
+echo "Running hosts cluster_check playbook"
-ansible-playbook -s -i hosts docker_repository.yml
+ansible-playbook -s -i deploy/hosts cluster_check.yml
-ansible-playbook -s -i hosts docker_base_storlet_images.yml
+echo "Running docker_repository playbook"
-ansible-playbook -s -i hosts docker_storlet_engine_image.yml
+ansible-playbook -s -i deploy/hosts docker_repository.yml
-ansible-playbook -s -i hosts storlet_mgmt.yml
+echo "Running docker_base_storlet_images playbook"
-ansible-playbook -s -i hosts fetch_proxy_conf.yml
+ansible-playbook -s -i deploy/hosts docker_base_storlet_images.yml
-ansible-playbook -s -i hosts host_storlet_engine.yml
+echo "Running docker_storlet_engine_image playbook"
+ansible-playbook -s -i deploy/hosts docker_storlet_engine_image.yml
+echo "Running hosts storlet_mgmt playbook"
+ansible-playbook -s -i deploy/hosts storlet_mgmt.yml
+echo "Running hosts fetch_proxy_conf playbook"
+ansible-playbook -s -i deploy/hosts fetch_proxy_conf.yml
+echo "Running  host_storlet_engine playbook"
+ansible-playbook -s -i deploy/hosts host_storlet_engine.yml
 sudo chmod -R 777 /opt/ibm
-ansible-playbook -i hosts create_default_tenant.yml
+echo "Running create_default_tenant playbook"
+ansible-playbook -i deploy/hosts create_default_tenant.yml