Skip to content

Commit

Permalink
Merge pull request #6 from jhg03a/Add-better-server-port-defaults
Browse files Browse the repository at this point in the history 
Convert from a generic default set of server params to per component
  • Loading branch information
@jhg03a
jhg03a committed Dec 17, 2019
2 parents 58f67c3 + 630f2a4 commit f3e0db5
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 43 deletions.
88 changes: 75 additions & 13 deletions infrastructure/ansible/roles/dataset_loader/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,83 @@ dl_ds_default_servers:
server.kabletown.invalid:
tcpPort: 80
httpsPort: 443
xmppId:
xmppPasswd:
ip6Address:
ip6Gateway:
rack: M2
mgmtIpAddress:
mgmtIpNetmask:
mgmtIpGateway:
iloIpAddress:
iloIpNetmask:
iloIpGateway:
iloUsername:
iloPassword:
rack: M1
routerHostName: 1hop.router.kabletown.invalid
routerPortName: 1/1/1/1
riak.kabletown.invalid:
tcpPort: 8087 # Note: this is actually wired in via TO cdn.conf if it ever needs to be different, it's adjusted here for human clarity. It's also the Riak protobuf port, not http rest port which is defaulted to 8098 and probably disabled.
httpsPort: 8088 # Note: this isn't actually used anywhere, it's just for human clarity. This is the default for the rest https interface for things like SOLR or curl.
rack: M2
routerHostName: 2hop.router.kabletown.invalid
routerPortName: 2/1/1/1
influxdb.kabletown.invalid:
tcpPort: 8086 # Note: This is used by TO as a fallback on https or http
httpsPort: 8086 # Note: This is used by TO for https connections
rack: M3
routerHostName: 3hop.router.kabletown.invalid
routerPortName: 3/1/1/1
traffic_monitor.kabletown.invalid:
tcpPort: 80 # Note: This may be used by traffic_stats and traffic router
httpsPort: 443 # Note: This may be used by traffic_stats and traffic router
rack: M4
routerHostName: 4hop.router.kabletown.invalid
routerPortName: 4/1/1/1
atsec.kabletown.invalid:
tcpPort: 80 # Note: This may be used by traffic_monitor for astats
httpsPort: 443 # Note: This may be used by traffic_monitor for astats
rack: M4
routerHostName: 4hop.router.kabletown.invalid
routerPortName: 4/1/1/1
atsmid.kabletown.invalid:
tcpPort: 80 # Note: This may be used by traffic_monitor for astats
httpsPort: 443 # Note: This may be used by traffic_monitor for astats
rack: M5
routerHostName: 5hop.router.kabletown.invalid
routerPortName: 5/1/1/1
grove.kabletown.invalid:
tcpPort: 80 # Note: This may be used by traffic_monitor for astats
httpsPort: 443 # Note: This may be used by traffic_monitor for astats
rack: M6
routerHostName: 6hop.router.kabletown.invalid
routerPortName: 6/1/1/1
fakeorigin.kabletown.invalid:
tcpPort: 80 # Note: This may be used by TO ATS Config generation for Multi-site origins
rack: M6
routerHostName: 6hop.router.kabletown.invalid
routerPortName: 6/1/1/1
mso_parent_alias.kabletown.invalid:
tcpPort: 80 # Note: This may be used by TO ATS Config generation for Multi-site origins
rack: M7
routerHostName: 7hop.router.kabletown.invalid
routerPortName: 7/1/1/1
traffic_opsdb.kabletown.invalid:
tcpPort: 5432 # Note: This is actually wired in via TO config files, but is here for human clarity
rack: M8
routerHostName: 8hop.router.kabletown.invalid
routerPortName: 8/1/1/1
traffic_ops.kabletown.invalid:
tcpPort: 80 # Note: This is actually wired in via TO config files, but is here for human clarity
httpsPort: 443 # Note: This is actually wired in via TO config files, but is here for human clarity
rack: M9
routerHostName: 9hop.router.kabletown.invalid
routerPortName: 9/1/1/1
traffic_portal.kabletown.invalid:
httpsPort: 443 # Note: This is actually wired in via TP config files, but is here for human clarity
rack: M10
routerHostName: 10hop.router.kabletown.invalid
routerPortName: 10/1/1/1
traffic_router.kabletown.invalid:
tcpPort: 80 # Note: This is actually wired in via TR server.xml config file, but is here for human clarity. Note that default port 53 is also used for DNS.
httpsPort: 443 # Note: This is actually wired in via TR server.xml config file, but is here for human clarity. Note that default port 53 is also used for DNS.
rack: M11
routerHostName: 11hop.router.kabletown.invalid
routerPortName: 11/1/1/1
influxrelay.kabletown.invalid:
tcpPort: 9086 # Note: This is actually wired in via influx-relay config files, but is here for human clarity
httpsPort: 9087 # Note: This is actually wired in via influx-relay config files, but is here for human clarity
rack: M12
routerHostName: 12hop.router.kabletown.invalid
routerPortName: 12/1/1/1

# TO Profiles (non-template) and associated parameters
dl_ds_merged_profiles: "{{ dl_ds_default_profiles }}"
Expand Down
62 changes: 32 additions & 30 deletions infrastructure/ansible/roles/dataset_loader/tasks/dataset_loader.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,21 +694,22 @@
ip6Address: "{{ hostvars[item].ansible_default_ipv6.address | default(omit) }}"
ip6Gateway: "{{ hostvars[item].ansible_default_ipv6.gateway | default(omit) }}"
interfaceMtu: "{{ hostvars[item].ansible_default_ipv4.mtu | default('9000') }}"
tcpPort: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).tcpPort | default(omit) }}"
httpsPort: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).httpsPort | default(omit) }}"
xmppId: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).xmppId | default(omit) }}"
xmppPasswd: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).xmppPasswd | default(omit) }}"
rack: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).rack | default(omit) }}"
mgmtIpAddress: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpAddress | default(omit) }}"
mgmtIpNetmask: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpNetmask | default(omit) }}"
mgmtIpGateway: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpGateway | default(omit) }}"
iloIpAddress: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpAddress | default(omit) }}"
iloIpNetmask: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpNetmask | default(omit) }}"
iloIpGateway: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpGateway | default(omit) }}"
iloUsername: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloUsername | default(omit) }}"
iloPassword: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloPassword | default(omit) }}"
routerHostName: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).routerHostName | default(omit) }}"
routerPortName: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).routerPortName | default(omit) }}"
default_inventory_hostname: "{{ hostvars[item].component | default('server') }}.kabletown.invalid"
tcpPort: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).tcpPort) | default(omit) }}"
httpsPort: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).httpsPort) | default(omit) }}"
xmppId: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).xmppId) | default(omit) }}"
xmppPasswd: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).xmppPasswd) | default(omit) }}"
rack: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).rack) | default(omit) }}"
mgmtIpAddress: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpAddress) | default(omit) }}"
mgmtIpNetmask: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpNetmask) | default(omit) }}"
mgmtIpGateway: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpGateway) | default(omit) }}"
iloIpAddress: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpAddress) | default(omit) }}"
iloIpNetmask: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpNetmask) | default(omit) }}"
iloIpGateway: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpGateway) | default(omit) }}"
iloUsername: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloUsername) | default(omit) }}"
iloPassword: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloPassword) | default(omit) }}"
routerHostName: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).routerHostName) | default(omit) }}"
routerPortName: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).routerPortName) | default(omit) }}"
register: create_server_out
failed_when: (create_server_out.status == 400 and create_server_out.json | to_json | from_json | json_query(error_query) | length != 0) or (create_server_out.status > 400 and create_server_out.status < 600)
no_log: true
Expand Down Expand Up @@ -765,21 +766,22 @@
ip6Address: "{{ omit }}"
ip6Gateway: "{{ omit }}"
interfaceMtu: "9000"
tcpPort: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).tcpPort | default(omit) }}"
httpsPort: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).httpsPort | default(omit) }}"
xmppId: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).xmppId | default(omit) }}"
xmppPasswd: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).xmppPasswd | default(omit) }}"
rack: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).rack | default(omit) }}"
mgmtIpAddress: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpAddress | default(omit) }}"
mgmtIpNetmask: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpNetmask | default(omit) }}"
mgmtIpGateway: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).mgmtIpGateway | default(omit) }}"
iloIpAddress: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpAddress | default(omit) }}"
iloIpNetmask: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpNetmask | default(omit) }}"
iloIpGateway: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloIpGateway | default(omit) }}"
iloUsername: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloUsername | default(omit) }}"
iloPassword: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).iloPassword | default(omit) }}"
routerHostName: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).routerHostName | default(omit) }}"
routerPortName: "{{ (dl_ds_merged_servers[item] | default(dl_ds_merged_servers['server.kabletown.invalid'])).routerPortName | default(omit) }}"
default_inventory_hostname: "{{ hostvars[item].component | default('server') }}.kabletown.invalid"
tcpPort: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).tcpPort) | default(omit) }}"
httpsPort: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).httpsPort) | default(omit) }}"
xmppId: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).xmppId) | default(omit) }}"
xmppPasswd: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).xmppPasswd) | default(omit) }}"
rack: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).rack) | default(omit) }}"
mgmtIpAddress: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpAddress) | default(omit) }}"
mgmtIpNetmask: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpNetmask) | default(omit) }}"
mgmtIpGateway: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).mgmtIpGateway) | default(omit) }}"
iloIpAddress: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpAddress) | default(omit) }}"
iloIpNetmask: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpNetmask) | default(omit) }}"
iloIpGateway: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloIpGateway) | default(omit) }}"
iloUsername: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloUsername) | default(omit) }}"
iloPassword: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).iloPassword) | default(omit) }}"
routerHostName: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).routerHostName) | default(omit) }}"
routerPortName: "{{ ((dl_ds_merged_servers[item] | default(dl_ds_merged_servers[default_inventory_hostname]) | default(dl_ds_merged_servers['server.kabletown.invalid']) ).routerPortName) | default(omit) }}"
register: create_server_out
failed_when: (create_server_out.status == 400 and create_server_out.json | to_json | from_json | json_query(error_query) | length != 0) or (create_server_out.status > 400 and create_server_out.status < 600)
no_log: true
Expand Down

0 comments on commit f3e0db5

Please sign in to comment.