Skip to content

Commit

Permalink
fix SCU installation scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
panentheos committed Sep 27, 2024
1 parent 777e358 commit 18a3237
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion linux/build_scu_iso
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ with open('tmp/autoinstall.yaml', mode='w') as f:
f.write(f"""\
{open('scu/autoinstall.yaml').read()}
user-data:
{re.sub(r'(?m)^', ' ', subprocess.run(['bash', 'build_user_data.sh'], capture_output=True, text=True).stdout)}
{re.sub(r'(?m)^', ' ', subprocess.run(['bash', 'build_user_data.sh'], capture_output=True, text=True, check=True).stdout)}
""")

if args.staging:
Expand Down
2 changes: 1 addition & 1 deletion linux/build_user_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ fi

< cloud-init/user-data \
sed "s/GITHUB_REPO/${GITHUB_REPO/\//\\/}/g" \
| sed "s/GIT_BRANCH/$GIT_BRANCH/g" \
| sed "s/GIT_BRANCH/${GIT_BRANCH/\//\\/}/g" \
| sed "s/ANSIBLE_VAULT_PASSWORD/$ANSIBLE_VAULT_PASSWORD/g" \
10 changes: 5 additions & 5 deletions linux/group_vars/scu/users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ users:
- username: pswartz
comment: Paul Swartz
github: paulswartz
groups: [sudo, users]
groups: [admin, users]
- username: iwestcott
comment: Ian Westcott
github: ianwestcott
groups: [sudo, users]
groups: [admin, users]
- username: krisjohnson
comment: Kris Johnson
github: krisrjohnson21
groups: [sudo, users]
groups: [admin, users]
- username: bheathwlaz
comment: Brett Heath-Wlaz
github: panentheos
groups: [sudo, users]
groups: [admin, users]
- username: pkim
comment: Paul Kim
github: PaulJKim
groups: [sudo, users]
groups: [admin, users]
4 changes: 2 additions & 2 deletions linux/roles/scu/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

- name: Install SSM Agent
community.general.snap:
name:
- amazon-ssm-agent
name: amazon-ssm-agent
classic: true

- name: Check SSM registration
ansible.builtin.stat:
Expand Down
3 changes: 3 additions & 0 deletions linux/scu/autoinstall.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ identity:
username: ubuntu
password: ""
hostname: ""
ssh:
install-server: true
allow-pw: false
late-commands:
- sed -i "s/\(.*\)/\U\1/g" /target/etc/hostname

0 comments on commit 18a3237

Please sign in to comment.