Skip to content

Commit 0b3ac1e

Browse files
author
Martin Jackson
committed
Make adjustments for ansible code moving into separate collection repo
1 parent 63f7ca5 commit 0b3ac1e

8 files changed

Lines changed: 5 additions & 94 deletions

File tree

.github/linters/.gitleaks.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
[whitelist]
22
# As of v4, gitleaks only matches against filename, not path in the
33
# files directive. Leaving content for backwards compatibility.
4-
files = [
5-
"ansible/plugins/modules/*.py",
6-
"ansible/tests/unit/test_*.py",
7-
"ansible/tests/unit/v1/*.yaml",
8-
]
4+
files = [ ]

.github/workflows/ansible-lint.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/ansible-unittest.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

scripts/display-secrets-info.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ SCRIPT=$(get_abs_filename "$0")
1010
SCRIPTPATH=$(dirname "${SCRIPT}")
1111
COMMONPATH=$(dirname "${SCRIPTPATH}")
1212
PATTERNPATH=$(dirname "${COMMONPATH}")
13-
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
14-
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
15-
16-
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
1713

1814
if [ "$#" -ge 1 ]; then
1915
export VALUES_SECRET=$(get_abs_filename "${1}")

scripts/load-k8s-secrets.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ SCRIPT=$(get_abs_filename "$0")
1010
SCRIPTPATH=$(dirname "${SCRIPT}")
1111
COMMONPATH=$(dirname "${SCRIPTPATH}")
1212
PATTERNPATH=$(dirname "${COMMONPATH}")
13-
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
14-
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
15-
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
1613

1714
PATTERN_NAME=${1:-$(basename "`pwd`")}
1815

19-
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "${PLAYBOOKPATH}/k8s_secrets/k8s_secrets.yml"
16+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "rhvp.cluster_utils.k8s_secrets"

scripts/process-secrets.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ SCRIPT=$(get_abs_filename "$0")
1010
SCRIPTPATH=$(dirname "${SCRIPT}")
1111
COMMONPATH=$(dirname "${SCRIPTPATH}")
1212
PATTERNPATH=$(dirname "${COMMONPATH}")
13-
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
14-
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
15-
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
1613

1714
PATTERN_NAME=${1:-$(basename "`pwd`")}
1815
SECRETS_BACKING_STORE="$($SCRIPTPATH/determine-secretstore-backend.sh)"
1916

20-
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" "${PLAYBOOKPATH}/process_secrets/process_secrets.yml"
17+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" "rhvp.cluster_utils.process_secrets"

scripts/vault-utils.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ SCRIPT=$(get_abs_filename "$0")
1010
SCRIPTPATH=$(dirname "${SCRIPT}")
1111
COMMONPATH=$(dirname "${SCRIPTPATH}")
1212
PATTERNPATH=$(dirname "${COMMONPATH}")
13-
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
14-
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
15-
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
1613

1714
# Parse arguments
1815
if [ $# -lt 1 ]; then
@@ -28,4 +25,4 @@ if [ -z ${TASK} ]; then
2825
exit 1
2926
fi
3027

31-
ansible-playbook -t "${TASK}" -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "${PLAYBOOKPATH}/vault/vault.yaml"
28+
ansible-playbook -t "${TASK}" -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "rhvp.cluster_utils.vault"

scripts/write-token-kubeconfig.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,5 @@ SCRIPT=$(get_abs_filename "$0")
1212
SCRIPTPATH=$(dirname "${SCRIPT}")
1313
COMMONPATH=$(dirname "${SCRIPTPATH}")
1414
PATTERNPATH=$(dirname "${COMMONPATH}")
15-
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
16-
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
17-
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
1815

19-
ansible-playbook -e pattern_dir="${PATTERNPATH}" -e kubeconfig_file="${OUTPUTFILE}" "${PLAYBOOKPATH}/write-token-kubeconfig/write-token-kubeconfig.yml"
16+
ansible-playbook -e pattern_dir="${PATTERNPATH}" -e kubeconfig_file="${OUTPUTFILE}" "rhvp.cluster_utils.write-token-kubeconfig"

0 commit comments

Comments
 (0)