djpbessems/Packer.Images
djpbessems/Packer.Images
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug existing config map;Fix key;Fix tty mess of typos;Fix git push
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Danny Bessems 2022-07-26 10:08:35 +02:00
parent c29728594c
commit d986d5ab25
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
View File

@ -204,6 +204,8 @@
- ansible.builtin.uri: - ansible.builtin.uri:
url: "{{ item }}" url: "{{ item }}"
method: GET method: GET
headers:
Authorization: token {{ gitea_api_token.json.sha1 }}
register: gitea_existing_config_TST register: gitea_existing_config_TST
loop: loop:
# - https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/orgs # - https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/orgs
@ -211,7 +213,7 @@
- https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/users/administrator/keys - https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/users/administrator/keys
ignore_errors: yes ignore_errors: yes
- debug: - debug:
var: gitea_existing_config_TST var: gitea_existing_config_TST.results[].json.data
- block: - block:
@ -275,8 +277,8 @@
- name: Rebase/Push source gitops repository - name: Rebase/Push source gitops repository
ansible.builtin.shell: ansible.builtin.shell:
cmd: | cmd: |
git remote set-url origin https://git.{{ vapp['metacluster.fqdn']}}/mc/GitOps.Config.git git config --local http.sslVerify false
git config --local --http.sslVerify false git remote set-url origin https://administrator:{{ vapp['guestinfo.rootpw'] | urlencode }}@git.{{ vapp['metacluster.fqdn']}}/mc/GitOps.Config.git
git push git push
chdir: /opt/metacluster/git-repositories/gitops chdir: /opt/metacluster/git-repositories/gitops

2
ansible/roles/firstboot/files/ansible_payload/roles/tty/tasks/main.yml
View File

@ -9,7 +9,7 @@
ansible.builtin.template: ansible.builtin.template:
src: tty.j2 src: tty.j2
dest: /opt/firstboot/tty.sh dest: /opt/firstboot/tty.sh
user: root owner: root
group: root group: root
mode: 0700 mode: 0700

23
ansible/roles/firstboot/files/ansible_payload/templates/tty.j2
View File

@ -7,33 +7,34 @@ BGRY='\033[1;30m'
BBLU='\033[1;34m' BBLU='\033[1;34m'
BRED='\033[1;91m' BRED='\033[1;91m'
BWHI='\033[1;97m' BWHI='\033[1;97m'
CBLA='\033[?16;0;30cm' # Hide blinking cursor CBLA='\033[?16;0;30c' # Hide blinking cursor
DFLT='\033[1;0m' # Reset colour DFLT='\033[0m' # Reset colour
LCLR='\033[K' # Clear to end of line LCLR='\033[K' # Clear to end of line
PRST='\033[1;92m' # Reset cursor position PRST='\033[0;0H' # Reset cursor position
COMPONENTS=('ingress' 'storage' 'registry' 'git' 'gitops') COMPONENTS=('ingress' 'storage' 'registry' 'git' 'gitops')
FQDN='{{ vapp['metacluster.fqdn'] }}' FQDN='{{ vapp['metacluster.fqdn'] }}'
IPADDRESS='{{ vapp['guestinfo.ipaddres'] }}' IPADDRESS='{{ vapp['guestinfo.ipaddress'] }}'
# Waiting to allow boot sequence to finish; crude!
sleep 30
clear > /dev/tty1 clear > /dev/tty1
while /bin/true; do while /bin/true; do
echo -e "${PRST}" > /dev/tty1 echo -e "${PRST}" > /dev/tty1
echo -e "\n\n\t${DFLT}To manage this appliance, please connect to one of the following:${LCLR}\n" > /dev/tty1 echo -e "\n\n\t${DFLT}To manage this appliance, please connect to one of the following:${LCLR}\n" > /dev/tty1
for comp in "${COMPONENTS}"; do for c in "${COMPONENTS[@]}"; do
STATUS=$(curl -ks "https://${comp}.${FQDN}" -o /dev/null -w '%{http_code}') STATUS=$(curl -ks "https://${c}.${FQDN}" -o /dev/null -w '%{http_code}')
if [[ "${STATUS}" -eq "200" ]]; then if [[ "${STATUS}" -eq "200" ]]; then
echo -e "\t [${BGRN}+${DFLT}] ${BBLU}https://${comp}.${FQDN}${DFLT}${LCLR}" > /dev/tty1 echo -e "\t [${BGRN}+${DFLT}] ${BBLU}https://${c}.${FQDN}${DFLT}${LCLR}" > /dev/tty1
else else
echo -e "\t [${BRED}-${DFLT}] ${BBLU}https://${comp}.${FQDN}${DFLT}${LCLR}" > /dev/tty1 echo -e "\t [${BRED}-${DFLT}] ${BBLU}https://${c}.${FQDN}${DFLT}${LCLR}" > /dev/tty1
fi fi
done done
echo -e "\n\t${BGRY}Note that your DNS zone ${DFLT}must have ${BGRY} respective records defined, each pointing to:${DFLT}${LCLR}" > /dev/tty1 echo -e "\n\t${BGRY}Note that your DNS zone ${DFLT}must have${BGRY} respective records defined,\n\teach pointing to: ${DFLT}${IPADDRESS}${LCLR}" > /dev/tty1
echo -e "\t${BGRY} - ${DFLT}${IPADDRESS}${LCLR}" > /dev/tty1
echo -e "${CBLA}" > /dev/tty1 echo -e "${CBLA}" > /dev/tty1
sleep 1 sleep 1