Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify ansible-advanced-v2 #4203

Merged
merged 1 commit into from
Oct 27, 2021
Merged

Modify ansible-advanced-v2 #4203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion ansible/configs/ansible-advanced-v2/default_vars_osp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,13 @@ security_groups:
protocol: tcp
cidr: "0.0.0.0/0"
rule_type: Ingress

- name: WebSGehaproxyPort
description: "Allow haproxy port"
from_port: 1936
to_port: 1936
protocol: tcp
cidr: "0.0.0.0/0"
rule_type: Ingress

- name: HostSG
rules:
Expand All @@ -122,6 +128,23 @@ security_groups:
from_group: HostSG
rule_type: Ingress

- name: UnregisterPortSG
rules:
- name: UrpSGTCP
description: "Open following unregister tcp port for all"
from_port: 49201
to_port: 49220
protocol: tcp
cidr: "0.0.0.0/0"
rule_type: Ingress
- name: UrpSGUDP
description: "Open following unregister udp port for all"
from_port: 49201
to_port: 49220
protocol: udp
cidr: "0.0.0.0/0"
rule_type: Ingress

# Default instance type
__instance_type: 2c4g30d

Expand Down Expand Up @@ -155,6 +178,7 @@ instances:
- BastionSG
- HostSG
- WebSG
- UnregisterPortSG
tags:
- key: "AnsibleGroup"
value: "bastions,{{ bastion_group_name | default('controls') }}"
Expand Down
15 changes: 10 additions & 5 deletions ansible/configs/ansible-advanced-v2/post_software.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,10 @@
opentlc_user_email: "{{ email }}"
ssh_command: "ssh {{__control_user}}@{{ __control_node }}.{{ guid }}.{{ __subdomain }}"
ssh_password: "{{ __control_password }}"
dest: "{{ item }}"
dest: "/home/{{control_user_name}}/{{ control_user_resource_dir_name }}/access_details.yml"
mode: 0644
owner: root
group: root
loop:
- "/home/{{control_user_name}}/{{ control_user_resource_dir_name }}/access_details.yml"
- "{{ lab_mgr_dir }}/vars/access_details.yml"
delegate_to: "{{ groups['bastions'][0] }}"

- name: Add variables to /etc/skel/.bashrc and ~{{ control_user_name }}/.bashrc
Expand All @@ -87,6 +84,9 @@
export SUBDOMAIN={{ __subdomain }}
export OPENTLC_USER_ID={{ __control_user }}
export OPENTLC_USER_EMAIL={{ email }}
export LAB_MGR_DIR={{ lab_mgr_dir }}
export CLOUD_PROVIDER={{ cloud_provider }}
export INTERNAL_DOMAIN=example.com
loop:
- "/etc/skel/.bash_profile"
- "~{{ control_user_name }}/.bash_profile"
Expand All @@ -107,10 +107,15 @@
- "To Access Gitlab UI via browser:"
- "Gitlab UI URL: https://{{ __gitlab_server }}.{{ guid }}.{{ __subdomain }}:8929"
- ""
- "To Access Haproxy Statistics"
- "Haproxy WebUI: https://{{ __control_node }}.{{ guid }}.{{ __subdomain }}:1936/haproxy?stats"
- "Haproxy username: {{ __satellite_user }}"
- "Haproxy Password: {{ __satellite_password }}"
- ""
- "To Access Control node via SSH:"
- "ssh {{ __control_user }}@{{ __control_node }}.{{ guid }}.{{ __subdomain }}"
- "Enter ssh password when prompted: {{ __control_password }}"

- name: Save user data
agnosticd_user_info:
data:
Expand Down