Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add developer mode option for cdpy #71

Merged
merged 1 commit into from
Nov 23, 2021
Merged

Add developer mode option for cdpy #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ PROJECT_DIR=${1:-${PARENT_DIRECTORY}}
echo "Checking if Docker is running..."
{ docker info >/dev/null 2>&1; echo "Docker OK"; } || { echo "Docker is required and does not seem to be running - please start Docker and retry" ; exit 1; }

docker pull ${IMAGE_NAME}:"${IMAGE_TAG}"
echo "Checking for updated execution container image '${IMAGE_FULL_NAME}'"
docker pull "${IMAGE_FULL_NAME}"

echo "Ensuring default credential paths are available in calling using profile for mounting to execution environment"
for thisdir in ".aws" ".ssh" ".cdp" ".azure" ".kube" ".config" ".config/cloudera-deploy/log" ".config/cloudera-deploy/profiles"
Expand All @@ -51,17 +52,26 @@ if [ ! -f "${HOME}"/.config/cloudera-deploy/profiles/default ]; then
fi

# If CLDR_COLLECTION_PATH is set, the default version in the container will be removed and this path added to the Ansible Collection path
# The path supplied must be relative to PROJECT_DIR
# The path supplied must be relative to PROJECT_DIR, e.g. ansible_dev/collections
if [ -n "${CLDR_COLLECTION_PATH}" ]; then
echo "Path to custom Cloudera Collection supplied as ${CLDR_COLLECTION_PATH}, adding to Ansible Collection path"
ANSIBLE_COLLECTIONS_PATH="/opt/cldr-runner/collections:/runner/project/${CLDR_COLLECTION_PATH}"
QUICKSTART_PROMPT='Quickstart? Run this command -- ansible-playbook project/cloudera-deploy/main.yml -e "definition_path=examples/sandbox" -t run,default_cluster'
else
echo "Custom Cloudera Collection path not found"
ANSIBLE_COLLECTIONS_PATH="/opt/cldr-runner/collections"
QUICKSTART_PROMPT='Quickstart? Run this command -- ansible-playbook /opt/cloudera-deploy/main.yml -e "definition_path=examples/sandbox" -t run,default_cluster'
fi

echo "Mounting ${PROJECT_DIR} to container as Project Directory /runner/project"
echo "Creating Container ${CONTAINER_NAME} from image ${IMAGE_FULL_NAME}"
# If CLDR_PYTHON_PATH is set, that will be set as the system PYTHONPATH variable in the container
# This is a good way to point at any custom python source code in your /runner/project mount, including CDPY
# The path supplied must be a full path to the source root for each source included, e.g /runner/project/cdpy/src
if [ -n "${CLDR_PYTHON_PATH}" ]; then
echo "Path to custom Python sourcecode supplied as ${CLDR_PYTHON_PATH}, setting as System PYTHONPATH"
PYTHONPATH="${CLDR_PYTHON_PATH}"
else
echo "'CLDR_PYTHON_PATH' is not set, skipping setup of PYTHONPATH in execution container"
fi

echo "Checking if ssh-agent is running..."
if pgrep -x "ssh-agent" >/dev/null
Expand All @@ -75,12 +85,12 @@ fi
echo "Checking OS"
if [ ! -f "/run/host-services/ssh-auth.sock" ];
then
if [ ! -z "$SSH_AUTH_SOCK" ];
if [ -n "${SSH_AUTH_SOCK}" ];
then
SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
else
echo "SSH_AUTH_SOCK is empty or not set, unable to proceed. Exiting"
exit -1
echo "ERROR: SSH_AUTH_SOCK is empty or not set, unable to proceed. Exiting"
exit 1
fi
else
SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
Expand All @@ -95,11 +105,11 @@ if [ ! "$(docker ps -q -f name=${CONTAINER_NAME})" ]; then
docker rm "${CONTAINER_NAME}" >/dev/null 2>&1 || echo "Execution container '${CONTAINER_NAME}' already removed, continuing..."
fi
# create new container if not running
echo "Creating new execution container named '${CONTAINER_NAME}'"
echo "Creating new execution container named '${CONTAINER_NAME}' with '${PROJECT_DIR}' mounted to /runner/project from image '${IMAGE_FULL_NAME}'"
docker run -td \
--detach-keys="ctrl-@" \
-v "${PROJECT_DIR}":/runner/project \
--mount type=bind,src=${SSH_AUTH_SOCK},target=/run/host-services/ssh-auth.sock \
--mount type=bind,src="${SSH_AUTH_SOCK}",target=/run/host-services/ssh-auth.sock \
-e SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock" \
-e ANSIBLE_LOG_PATH="/home/runner/.config/cloudera-deploy/log/${CLDR_BUILD_VER:-latest}-$(date +%F_%H%M%S)" \
-e ANSIBLE_INVENTORY="inventory" \
Expand All @@ -109,6 +119,7 @@ if [ ! "$(docker ps -q -f name=${CONTAINER_NAME})" ]; then
-e ANSIBLE_HOST_KEY_CHECKING=false \
-e ANSIBLE_SSH_RETRIES=10 \
-e ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_COLLECTIONS_PATH}" \
-e PYTHONPATH="${PYTHONPATH}" \
-e ANSIBLE_ROLES_PATH="/opt/cldr-runner/roles" \
-e AWS_DEFAULT_OUTPUT="json" \
--mount "type=bind,source=${HOME}/.aws,target=/home/runner/.aws" \
Expand All @@ -128,6 +139,9 @@ if [ ! "$(docker ps -q -f name=${CONTAINER_NAME})" ]; then
if [ -n "${CLDR_COLLECTION_PATH}" ]; then
docker exec -td "${CONTAINER_NAME}" /usr/bin/env rm -rf /opt/cldr-runner/collections/ansible_collections/cloudera
fi
if [ -n "${CLDR_PYTHON_PATH}" ]; then
docker exec -td "${CONTAINER_NAME}" pip uninstall -y cdpy
fi
fi

cat <<SSH_HOST_KEY
Expand All @@ -141,7 +155,7 @@ cat <<SSH_HOST_KEY

SSH_HOST_KEY

echo 'Quickstart? Run this command -- ansible-playbook /opt/cloudera-deploy/main.yml -e "definition_path=examples/sandbox" -t run,default_cluster'
echo "${QUICKSTART_PROMPT}"
docker exec \
--detach-keys="ctrl-@" \
-it "${CONTAINER_NAME}" \
Expand Down
4 changes: 2 additions & 2 deletions readme.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ Within the directory, you *must* supply the following files:

Optionally, if deploying a CDP Private Cloud cluster or need to set up adhoc IaaS infrastructure, you can supply the following :

* `inventory_static.ini`
* `inventory_template.ini`
* `inventory_template.ini`

The definition directory can host any other file or asset, such as data files, additional configuration details, additional playbooks. However, Cloudera Deploy will not operate unless the `definition.yml` and `application.yml` files are present.
Expand Down Expand Up @@ -501,7 +501,7 @@ NOTE: This file is a standard Ansible playbook, and when it is executed (via `im

=== `inventory_static.ini`

You may also include an `inventory_static.ini` file that describes your static Ansible inventory. This file will be automatically loaded and added to the Ansible inventory. Note that you can also use the standard Ansible `-i` switch to include other static inventory.
You may also include an `inventory_template.ini` file that describes your static Ansible inventory. This file will be automatically loaded and added to the Ansible inventory. Note that you can also use the standard Ansible `-i` switch to include other static inventory.

=== `inventory_template.ini`

Expand Down