mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 19:22:24 +00:00
scripts/ansible: Comment out unused code
This commit is contained in:
parent
409e8bc468
commit
16efa3c4cf
1 changed files with 17 additions and 17 deletions
|
@ -11,25 +11,25 @@ APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint
|
||||||
CURR_VER=undefined # Ansible version you currently have installed
|
CURR_VER=undefined # Ansible version you currently have installed
|
||||||
GOOD_VER=2.11.2 # Orig for 'yum install [rpm]' & XO laptops (pip install)
|
GOOD_VER=2.11.2 # Orig for 'yum install [rpm]' & XO laptops (pip install)
|
||||||
|
|
||||||
|
# 2021-06-22: The apt approach (with PPA source in /etc/apt/sources.list.d/ and
|
||||||
|
# .gpg key etc) are commented out with ### below. Asociated guidance/comments
|
||||||
|
# are intentionally preserved.
|
||||||
|
|
||||||
# 2021-05-19 PR #2743: As a result of Ansible / Red Hat / IBM's extensive
|
# 2021-05-19 PR #2743: As a result of Ansible / Red Hat / IBM's extensive
|
||||||
# delays in publishing the PPA (.deb installer files) for ansible-core, this
|
# delays in publishing the PPA (.deb installer files) for ansible-core, this
|
||||||
# file bypasses the apt approach (and associated PPA source) in favor of:
|
# file bypasses the apt approach (and associated PPA source) in favor of:
|
||||||
#
|
#
|
||||||
# pip3 install --upgrade ansible-core
|
# pip3 install --upgrade ansible-core
|
||||||
#
|
|
||||||
# What the future holds for 2022+ is not yet clear. So the apt approach (with
|
|
||||||
# PPA source in /etc/apt/sources.list.d/ and .gpg key etc) and much associated
|
|
||||||
# guidance/comments below are NOT being commented out or deleted at this time.
|
|
||||||
|
|
||||||
# 2021-02-25: Latest 'ansible-base' was being installed from PPA, using either
|
# 2021-02-25: Latest 'ansible-base' was being installed from PPA, using either
|
||||||
# OS 'CODENAME' below: https://launchpad.net/~ansible/+archive/ubuntu/ansible
|
# OS 'CODENAME' below: https://launchpad.net/~ansible/+archive/ubuntu/ansible
|
||||||
|
|
||||||
# 'lsb_release -sc' gives Mint 20 codename 'ulyana' etc: (TOO FINE-GRAINED)
|
# 'lsb_release -sc' gives Mint 20 codename 'ulyana' etc: (TOO FINE-GRAINED)
|
||||||
if grep -q buster /etc/os-release /etc/debian_version; then
|
###if grep -q buster /etc/os-release /etc/debian_version; then
|
||||||
CODENAME=bionic # Debian 10, RaspiOS 10 & Buster-like distros
|
### CODENAME=bionic # Debian 10, RaspiOS 10 & Buster-like distros
|
||||||
else
|
###else
|
||||||
CODENAME=focal # Debian 11+, RaspiOS 11+, Ubuntu 20.04+, Mint 20+ (ETC)
|
### CODENAME=focal # Debian 11+, RaspiOS 11+, Ubuntu 20.04+, Mint 20+ (ETC)
|
||||||
fi
|
###fi
|
||||||
|
|
||||||
# APRIL 2021 - ansible-base (2.10) was renamed to ansible-core (2.11+):
|
# APRIL 2021 - ansible-base (2.10) was renamed to ansible-core (2.11+):
|
||||||
# https://www.ansible.com/blog/ansible-3.0.0-qa
|
# https://www.ansible.com/blog/ansible-3.0.0-qa
|
||||||
|
@ -121,8 +121,8 @@ fi
|
||||||
#$APT_PATH/apt update
|
#$APT_PATH/apt update
|
||||||
#$APT_PATH/apt -y install dirmngr
|
#$APT_PATH/apt -y install dirmngr
|
||||||
#echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
|
#echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
|
||||||
echo "deb [signed-by=/usr/share/keyrings/iiab-ansible-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
|
###echo "deb [signed-by=/usr/share/keyrings/iiab-ansible-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
|
||||||
> /etc/apt/sources.list.d/iiab-ansible.list
|
### > /etc/apt/sources.list.d/iiab-ansible.list
|
||||||
|
|
||||||
# In future we might instead consider 'add-apt-repository ppa:ansible/ansible'
|
# In future we might instead consider 'add-apt-repository ppa:ansible/ansible'
|
||||||
# or 'apt-add-repository ppa:ansible/bionic/ansible' etc, e.g. for streamlined
|
# or 'apt-add-repository ppa:ansible/bionic/ansible' etc, e.g. for streamlined
|
||||||
|
@ -140,14 +140,14 @@ echo "deb [signed-by=/usr/share/keyrings/iiab-ansible-keyring.gpg] http://ppa.la
|
||||||
# 2021-04-26: JV & @holta WIP: (see above)
|
# 2021-04-26: JV & @holta WIP: (see above)
|
||||||
#echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
|
#echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
|
||||||
#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
|
#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
|
||||||
cp /opt/iiab/iiab/scripts/iiab-ansible-keyring.gpg /usr/share/keyrings/iiab-ansible-keyring.gpg
|
###cp /opt/iiab/iiab/scripts/iiab-ansible-keyring.gpg /usr/share/keyrings/iiab-ansible-keyring.gpg
|
||||||
#chmod 644 /usr/share/keyrings/iiab-ansible-keyring.gpg
|
#chmod 644 /usr/share/keyrings/iiab-ansible-keyring.gpg
|
||||||
|
|
||||||
echo -e 'PPA source "deb [signed-by=/usr/share/keyrings/iiab-ansible-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu '$CODENAME' main"'
|
###echo -e 'PPA source "deb [signed-by=/usr/share/keyrings/iiab-ansible-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu '$CODENAME' main"'
|
||||||
echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
|
###echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
|
||||||
echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
|
###echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
|
||||||
echo -e 'ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
|
###echo -e 'ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
|
||||||
grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true # Override bash -e (instead of aborting at 1st error)
|
###grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true # Override bash -e (instead of aborting at 1st error)
|
||||||
|
|
||||||
echo -e "\napt update; apt install of python3-* / virtualenv packages explained at:"
|
echo -e "\napt update; apt install of python3-* / virtualenv packages explained at:"
|
||||||
echo -e "https://github.com/iiab/iiab/blob/master/scripts/ansible.md\n"
|
echo -e "https://github.com/iiab/iiab/blob/master/scripts/ansible.md\n"
|
||||||
|
|
Loading…
Reference in a new issue