diff --git a/git-hooks/pre-push.d/ansible-lint.hook b/git-hooks/pre-push.d/ansible-lint.hook index 11a2d51cf..2d978cb81 100755 --- a/git-hooks/pre-push.d/ansible-lint.hook +++ b/git-hooks/pre-push.d/ansible-lint.hook @@ -3,7 +3,7 @@ # Rename to ansible-lint.hook and alter to your needs. GIT_DIR=$(git rev-parse --show-toplevel 2> /dev/null) ROLES_LIST=$(cd "$GIT_DIR" && find roles/ -type d -name "tasks" -exec dirname {} \;) -ANSIBLE_LINT="/usr/local/bin/ansible-lint" +ANSIBLE_LINT="/home/ce-dev/ce-python/bin/ansible-lint" PROVISION_CONTAINER="provision-controller" CONTAINER_BASE_PATH="/home/ce-dev/ce-provision" OS=$(uname -s) diff --git a/git-hooks/pre-push.d/yamllint.hook b/git-hooks/pre-push.d/yamllint.hook index ca6824ec5..38cfbd9d9 100755 --- a/git-hooks/pre-push.d/yamllint.hook +++ b/git-hooks/pre-push.d/yamllint.hook @@ -5,6 +5,7 @@ PROVISION_CONTAINER="provision-controller" CONTAINER_BASE_PATH="/home/ce-dev/ce-provision" OS=$(uname -s) DOCKER_USER="ce-dev" +YAMLLINT_PATH="/home/ce-dev/ce-python/bin/yamllint" if [ "$OS" = "Darwin" ]; then DOCKER_BIN="docker" else @@ -12,7 +13,7 @@ else fi DOCKER_CMD="$DOCKER_BIN exec --user $DOCKER_USER --workdir $CONTAINER_BASE_PATH -i $PROVISION_CONTAINER" printf "\e[36m Running Yaml linter \n" -YAML_LINT_CMD="$DOCKER_CMD yamllint roles" +YAML_LINT_CMD="$DOCKER_CMD $YAMLLINT_PATH roles" ERRORS=$($YAML_LINT_CMD | wc -l) if [ "$ERRORS" != "0" ]; then $YAML_LINT_CMD diff --git a/roles/debian/mysql_client/meta/main.yml b/roles/debian/mysql_client/meta/main.yml new file mode 100644 index 000000000..0a46a8c7d --- /dev/null +++ b/roles/debian/mysql_client/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: debian/user_deploy