cleanup dirty merge

Signed-off-by: usrbinkat <usrbinkat@braincraft.io>
CodeSparta · Jan 26, 2021 · 38431a0 · 38431a0
1 parent 05e099f
commit 38431a0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 55 deletions.
diff --git a/collector/site.yml b/collector/site.yml
@@ -7,7 +7,6 @@
 - import_playbook: tree.yml          # Create required directory tree
 - import_playbook: dependencies.yml  # Pull OpenShift oc
 - import_playbook: catalog.yml       # Build custom catalog image and write imageContentSourcePolicy, mirror.list, mapping.txt
-<<<<<<< HEAD
   when: not WallE
 
 - import_playbook: mirror.yml        # Download & Push Images
@@ -18,10 +17,3 @@
 
 - import_playbook: bundle.yml       # Bundle artifacts into CloudCtl compliant archive for manual carry
   when: bundle
-=======
-- import_playbook: mirror.yml        # Download & Push Images
-  when: mirror or bundle == 'true'
-
-- import_playbook: bundle.yml       # Bundle artifacts into CloudCtl compliant archive for manual carry
-  when: bundle == 'true'
->>>>>>> 873c5f110b08f5706ae5f0d940be10c308e8be3d
diff --git a/collector/tools/dev.sh b/collector/tools/dev.sh
@@ -1,29 +1,6 @@
 #!/bin/bash
 run () {
-<<<<<<< HEAD
 clear
-=======
-# For now, koffer operator collector must be run as root
-if (( $EUID != 0  )); then
-  echo ">> Please run as root"
-  exit 1
-else
-# For now, koffer executes index image startup and custom image build on host
-# ansible connection over ssh required from koffer onto host
-  ready=$(ssh root@10.88.0.1 whoami ; echo $?)
-  if [[ ! ${ready} == 0 ]] && \
-     [[ -f "/root/.ssh/id_rsa" ]]; then
-        echo ">> Host ssh connection discovered successfully"
-  else
-        echo ">> Host ssh connection not found"
-        echo ">> Configuring host for cni ssh connection"
-        [[ -f ${HOME}/.ssh/id_rsa ]] \
-        || ssh-keygen -f ${HOME}/.ssh/id_rsa -t rsa -N ''
-        cat ${HOME}/.ssh/id_rsa.pub >> ${HOME}/.ssh/authorized_keys
-        chmod 0644 ${HOME}/.ssh/authorized_keys
-  fi
-fi
->>>>>>> 873c5f110b08f5706ae5f0d940be10c308e8be3d
 
 #ansible_user="$(whoami)"
 project="collector-operators"
@@ -32,36 +9,17 @@ echo ">> Pulling quay.io/cloudctl/koffer"
 podman pull quay.io/cloudctl/koffer:extra
 
 rm -rf /tmp/koffer
-<<<<<<< HEAD
 mkdir -p /tmp/koffer ${HOME}/{.docker,bundle,operators}
-cp -rf ~/.docker /tmp/koffer/.docker
-=======
-mkdir -p /tmp/koffer
-mkdir -p ${HOME}/{bundle,operators}
-cp -rf ~/.ssh /tmp/koffer/.ssh
-cp -rf ~/.aws /tmp/koffer/.aws
-cp -rf ~/.docker /tmp/koffer/.docker
-mkdir -p /tmp/koffer/{.ssh,.docker,.aws}
->>>>>>> 873c5f110b08f5706ae5f0d940be10c308e8be3d
+cp -rf ~/.docker /tmp/koffer/
 
 #clear
 echo ">>  Starting Koffer"
 podman run -it --rm --entrypoint bash \
-<<<<<<< HEAD
     --name ${project} -h ${project}                \
     --privileged --device /dev/fuse                \
     --volume  $(pwd):/root/koffer:z                \
-    --volume  ${HOME}/bundle:/root/bundle:z        \
-    --volume  /tmp/koffer/.docker:/root/.docker:z  \
-=======
-    --privileged \
-    --device /dev/fuse \
-    --workdir ${HOME}/koffer                       \
-    --name ${project} -h ${project}                \
-    --volume  $(pwd):/root/koffer:z                \
     --volume  /tmp/koffer/.docker:/root/.docker:z  \
     --volume  ${HOME}/bundle:/root/bundle:z        \
->>>>>>> 873c5f110b08f5706ae5f0d940be10c308e8be3d
   quay.io/cloudctl/koffer:extra
 }
 

diff --git a/collector/tree.yml b/collector/tree.yml
@@ -19,11 +19,7 @@
         path: '{{ item }}'
         state: directory
         mode: '0744'
-<<<<<<< HEAD
         recurse: no
-=======
-        recurse: yes
->>>>>>> 873c5f110b08f5706ae5f0d940be10c308e8be3d
       with_items:
         - '{{ dir_platform }}'
         - '{{ dir_platform }}/mirror'