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.

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

Created pull request: changes in Cinder storage for compute nodes to work for Embassy, edited configuration for new Fender, created Fender CA, minor bug fixes #438

Merged
merged 6 commits into from
Aug 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions deploy-os_servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
dns_nameservers: "{{ nameservers }}"
wait: true
timeout: "{{ openstack_api_timeout }}"
tags:
- never
- name: "Create {{ network_private_storage_id }} network."
openstack.cloud.network:
name: "{{ network_private_storage_id }}"
Expand Down Expand Up @@ -306,19 +304,14 @@
#
- ansible_python_interpreter: python
tasks:
- name: Create persistent data volume for repo server.
openstack.cloud.volume:
display_name: "{{ inventory_hostname }}-volume"
size: "{{ local_volume_size_repo }}"
state: present
availability_zone: "{{ storage_availability_zone | default('nova') }}"
wait: true
timeout: "{{ openstack_api_timeout }}"
- name: Create repo server.
openstack.cloud.server:
state: present
name: "{{ inventory_hostname }}"
image: "{{ cloud_image }}"
volume_size: "{{ local_volume_size_root }}"
terminate_volume: true
boot_from_volume: true
flavor: "{{ flavor_management }}"
security_groups: "{{ slurm_cluster_name }}_cluster"
auto_floating_ip: false
Expand Down Expand Up @@ -359,6 +352,9 @@
state: present
name: "{{ inventory_hostname }}"
image: "{{ cloud_image }}"
volume_size: "{{ local_volume_size_root }}"
terminate_volume: true
boot_from_volume: true
flavor: "{{ flavor_ui }}"
security_groups: "{{ slurm_cluster_name }}_cluster"
auto_floating_ip: false
Expand Down Expand Up @@ -408,6 +404,9 @@
state: present
name: "{{ inventory_hostname }}"
image: "{{ cloud_image }}"
volume_size: "{{ local_volume_size_root }}"
terminate_volume: true
boot_from_volume: true
flavor: "{{ flavor_vcompute }}"
security_groups: "{{ slurm_cluster_name }}_cluster"
auto_floating_ip: false
Expand Down Expand Up @@ -464,6 +463,9 @@
state: present
name: "{{ inventory_hostname }}"
image: "{{ cloud_image }}"
volume_size: "{{ local_volume_size_root }}"
terminate_volume: true
boot_from_volume: true
flavor: "{{ flavor_management }}"
security_groups: "{{ slurm_cluster_name }}_cluster"
auto_floating_ip: false
Expand Down
2 changes: 1 addition & 1 deletion galaxy-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ collections:
- name: community.general
version: '>=3.0.2'
- name: openstack.cloud
version: '>=1.2.1'
version: '>=1.5.0'
- name: ansible.posix
version: '>=1.2.0'
- name: pulp.pulp_installer
Expand Down
4 changes: 3 additions & 1 deletion generate_secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ def write_secrets(template_file, secrets_file):
# We use a minimum password length of 60 and a max length of 80.
#
pass_length = random.randint(60, 80)
if key == 'cloud_console_pass':
pass_length = 12
data[key] = ''.join(
random.choice(string.ascii_letters + string.digits + '!?@%&[]^_+-{}<=>~.,;:\|/')
random.choice(string.ascii_letters + string.digits + '!?@%&[]^_+-{}<=>~.,;:|/')
for _ in range(pass_length))
else:
print('INFO: preserving existing value "' + data[key] + '" for key "' + key + '".')
Expand Down
8 changes: 7 additions & 1 deletion group_vars/all/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ ai_jumphost: "{{ lookup('env','AI_PROXY') }}"
firewall_allowed_tcp_ports:
- '22' # SSH
- '9100' # Node Exporter

#
# Local volume size (root partition) for all instances
#
local_volume_size_root: 33

#
# Public keys of all local admins.
#
Expand Down Expand Up @@ -80,4 +86,4 @@ pulp_repos:
description: 'Lustre client Long Term Support (LTS) releases for Enterprise Linux 7.'
remote_url: https://downloads.whamcloud.com/public/lustre/latest-release/el7/client/
client_baseurl: "https://{{ stack_prefix }}-repo/pulp/content/{{ slurm_cluster_name }}/lustre7/"
...
...
91 changes: 48 additions & 43 deletions group_vars/fender_cluster/ip_addresses.yml
Original file line number Diff line number Diff line change
@@ -1,99 +1,104 @@
---
ip_addresses:
fd-dai:
addr: 192.168.0.21
mask: /32
vlan: vlan983
fqdn:
desc: Deploy Admin Interface
fd-sai:
addr: 192.168.0.22
addr: 10.10.1.219
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Sys Admin Interface
fd-dai:
addr: 10.10.1.70
mask: /32
vlan: fd_internal_management
fqdn:
desc: Deploy Admin Interface
fd-vcompute12:
addr: 192.168.0.19
addr: 10.10.1.121
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute11:
addr: 192.168.0.15
addr: 10.10.1.221
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute10:
addr: 192.168.0.26
addr: 10.10.1.202
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute09:
addr: 192.168.0.25
fd-vcompute08:
addr: 10.10.1.37
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute08:
addr: 192.168.0.31
fd-vcompute09:
addr: 10.10.1.101
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute07:
addr: 192.168.0.28
addr: 10.10.1.253
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute06:
addr: 192.168.0.14
addr: 10.10.1.249
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute05:
addr: 192.168.0.9
fd-vcompute01:
addr: 10.10.1.120
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute04:
addr: 192.168.0.24
fd-vcompute05:
addr: 10.10.1.244
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute03:
addr: 192.168.0.5
fd-vcompute02:
addr: 10.10.1.240
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute02:
addr: 192.168.0.11
fd-vcompute04:
addr: 10.10.1.87
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fd-vcompute01:
addr: 192.168.0.13
fd-vcompute03:
addr: 10.10.1.59
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Compute Node
fender:
addr: 192.168.0.16
addr: 10.10.1.74
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: User Interface
fd-repo:
addr: 10.10.1.133
mask: /32
vlan: fd_internal_management
fqdn:
corridor:
addr: 192.168.0.8
addr: 10.10.1.48
mask: /32
vlan: vlan983
vlan: fd_internal_management
fqdn:
desc: Jumphost
...
115 changes: 64 additions & 51 deletions group_vars/fender_cluster/secrets.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,65 @@
$ANSIBLE_VAULT;1.2;AES256;fender
65663530376134326433653363306639303636643563626164383266636365383366336633643038
3432353231343935636130633834656462636564343266310a623134643832623130656132366236
34613732633564323135643832356334633231336531356637356534643861363766616462393561
6337356634333036370a643732636533373930626438396236643039613662373832626336303262
33343831616232323864663436646464386466643435313135316162666465393431396433333230
64663837383862623638346661316664393936343030393237636138646538306538663430663539
37656266316434316536613461653162366662303064396335323066306361666132393938326630
62623932616637333239366366336438633363343363643966623436383264626631333033643330
62386232323766363237313333393263353264336635346365333763346230663236363832326530
63623938346436343939633861323636383936326437376435343562336465623532313161646631
30343439363333633061353366323566393534393931646163313532613837623965393461316132
34323063646363643666656436353433326663373264626539353932393238353433356139366132
66353336626464363861366337316332346664646534663939613365306331613736353831313534
62613833633138326238316636336639613365306637613630353430303036373536666333386532
61396531363735383964383736363663663033383365346239356464356132313861616235363439
33376461383135653931636266633430386264363037656136326336636635353834366631383862
66316537313635373532336564333234356330313232636639343431383465646433656331646165
33353763316562616634343238333834323835356639633665386138653833633833613338333564
66623437666430336534623134383739623538353265316430666232376261616231383631666534
34303766393330623235353966326134306431623832396633656462666462626438383639343238
33383238313137343864373463396565613336393364633664343038366139616664313464313137
36333232653938313230646465646131396539643265373033343366373337386536363766656532
38356161323839373364333066356236386637656137353937653530386230346235633630356336
35643937613939656362383162623234326434633835396165353830353261356432633062623766
65346237373566313737346236336262323866663564353564613539623735366138323638323462
31303264366132653532336530343834633839653132356137626432393762373666646462373439
36363064613434623132393736373162303561333666303433366566316638313736613132393031
34373762356130666462646166626235346535306665653765356536653037663337313366643336
61376636636337336436636631373936613138343038336564666363323434353265623534326130
32306636616532346262633334633461323265323032363039663238353366666464313836613635
36343264326563326666663731626461383634633733643861346261323831376266363965343031
35636532313139373465303336333363353334663964306436653565386666333864326435323538
63346233623530396637353137633239643962373430613636303635326431306363346335343564
63623633386130313362613364373535303932663630316338356434616534343964646537636166
35316364636261663932323533613463633034313862343533373933393039353863376363356438
64316565623935623161396435316462613133646331313764656239303566343231343232303833
35316464393035666631633033666539633066646437383830343930303834303961343965326139
35643866396266653061373861313665323439643463396564353731316230626430663737623431
39663130383038356530383366343061623662643634303330313130643535313737653762353565
65336264386663366439343835383637396235643537356632663061386133626634356239613237
32623735626530346131316630373232353735646164366437366535616561656237343061383138
63363637383461303635316233386137616466616361623166643364316138333562613465333234
39363363326533393566616237366364376630326164383062326137336331623165313762653564
31373665373465663030666634373164323961333335396330363735386235393838656561306532
36613563356338643933376439653630623433326333653038333662363965613762306565643033
63343338393165373433323862386338616466356630393436353437373963623662306361363239
38656133376437626534386632326133363930333461366565313038323936386639313365306366
64323433303630383332303233633861663464643061303531326665636437643239366138386265
64633032386365316638653637336162366236643166663736376561646435366235316366633932
65353733616630626432653138316234366330333665653736303961633835313362396634623736
336635323432653037363830396266363465
36313066616666643430316632653132326237333433633637373634623539323635623565356661
3037363964663762356365366566323139316339343033360a383036646464343931393561313332
66366431343636613737393866656632393164323634306434656263386635623966343065623936
3662343734626235300a353831346562663038386464373131666634366532373266333134643635
35333761643539353930333566396137333864333630623362633266623836366534303966653364
39363035356163376538623136633030653235393566353531326162616636316533633364633765
33386566383863623761616132353035613832623137306362336466636131643730663961386635
65353462316265313061396433663935656563643433306639646233313661336532643162323832
33303462363733326235653861366338653736376233623639626665356465353563353038356636
64333564373831313366366165353837653736393262613661623330323734623035653039383431
65343131623063386561346230303963333263356533343066363036343264356135326235316635
32336436633039623137306665386466313232646134633034323836633764636461646238353935
38343166323866353936646631343535306665396661306562633736653265393662373533323334
38306363613538636361656635383465383037643665616162353535366534623039303335356336
33326236373831376138376436376535363334386562366138646565356564663332343936376138
36623933303836336461323166343565343031393266376265653963376331346637333438333066
32623636386564616430396230303037333730633936306232653563356237666564393066613263
38623365623564313864386339393530303761643162376439323863666534393335633039633664
31313131626338343532633663313131643164623766346563636566313533306230653861666166
33623435343135366434613164303962383964343462373230356165663137333365616337373739
38616563663834656465653964636363633234336336363830363537653330656533653533616566
66643437373735383935616665396533316165323163636430373431353032613430623731663465
61636537646235323866393035346334306536386534316634306566626631646163313863303031
63363464636633653438323430363465393339613362316338376566383530393334643564636633
63643338383164346530313532373662613336613463336637326463313930326332306632653566
35643462383632326539386234613431366130626233616562626331363862626530333939306662
65356664386438376161333432643535373466623033666266666333383330353462613439343233
39636533383265313263633062666134313031653634333932363966363763626538353061386465
36663837396136366138313536366561346335326532343730323634666638663639613961613631
65396534363431386235363264373335393232616531663165666361666665316164353738646465
39633731616530626337366232626334343864626131313034373837336464343631306436346537
32646663623563643061323935386562343231303336303932343461613932353330663736356231
32653038376666313532646333373262636533656163663232373639313532613739353830663431
32626137366132323630636638333437376264323738303962303037373166323333376330343738
65313735343332613234633466623866346264623261386364323531373239336166666236333838
62333461386162383631666161313464383330313566353561353538663265386635363838373663
38616132343434303939363561396362383739333765333438343664386132646238323031653036
35326331303963616631636139306666346461666337376139633038393336636630326332363935
30653532656263353439613963643632363062346131316132636532663063636531373337663334
66393863343938393665393335303234613931623138636263333035303236663865666435653364
62343461633030343761653733363863656562393661393263373835613763393561646163663430
62373962316664313164346263663035663533643861373364623663666165623563666539363834
30316561373738316262306632633839313262353163613035353264623765353737316534373330
32376365306539313738316164356638306665383833373431326664666366663435366437616632
65303434616539363565393062363262323862316662643663376435326364303334626466646166
38653665326136373638393261393363633966356433333339396135363663396139623037633236
30396264303861353733656137353233323961633239313331613261363064343633386638396464
62363066356330646164613035666166336237353234663939303635653635353665353931306164
65653138623632636339636365636535393465613535366633376337383531353463633030626135
38636235366337306434306663356537393035333531316266366339336566356134633430363730
32323364373462663935656235633039346163343462303638623531373236333038363065356665
35613030336531653932343730643632366230373931613732663238396239396337353166353130
31303238643637376334313838346165663431643330373239346539393964393137353031383764
37306434316432613634323631623564336461646666306438346462653238666632333332333937
66643563313536636535353730653734326462356431326432646164376134313433353166383836
38366535383361303561363832386337326339333965633237666230313661326433346431396434
36633433333931313733653039343036333931366661666338633461646265343734663333663930
38636132656363666436613237633230373233613039306636396636393236333133306431346663
33643163636366323732333666313833313037656363616261303162386337366461626133383133
63633339363933383939333463666331653839356464386262653535663839393434663639313931
61303233653263333430633965653363633839353439306263303030353565626634336664623936
37633032633530363662666264383432386536373033373066633163363733326337666538643965
37383635393261333430353437346632626665353937346438356433353633636530336332646635
30306132393865316632
Loading