Code Review
/
yaml_builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Moving dev branch code to master branch
[yaml_builds.git]
/
site
/
hpgen10
/
networks
/
common-addresses.yaml
diff --git
a/site/site30/networks/common-addresses.yaml
b/site/hpgen10/networks/common-addresses.yaml
similarity index 89%
rename from
site/site30/networks/common-addresses.yaml
rename to
site/hpgen10/networks/common-addresses.yaml
index
226f5f7
..
0d6ca3d
100644
(file)
--- a/
site/site30/networks/common-addresses.yaml
+++ b/
site/hpgen10/networks/common-addresses.yaml
@@
-1,6
+1,6
@@
---
##############################################################################
---
##############################################################################
-# Copyright
© 2018 AT&T Intellectual Property. All rights reserved.
#
+# Copyright
(c) 2018 AT&T Intellectual Property. All rights reserved.
#
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. #
@@
-37,10
+37,9
@@
data:
- 8.8.8.8
- 8.8.8.8
upstream_servers_joined: '192.168.2.85,8.8.8.8'
- 8.8.8.8
- 8.8.8.8
upstream_servers_joined: '192.168.2.85,8.8.8.8'
-
+ ingress_domain: hpgen10.akraino.org
genesis:
hostname: aknode30
genesis:
hostname: aknode30
-# ip: 192.168.2.30
ip: 172.29.1.30
bootstrap:
ip: 172.29.1.30
bootstrap:
@@
-63,6
+62,11
@@
data:
- hostname: aknode31
- hostname: aknode32
- hostname: aknode31
- hostname: aknode32
+ proxy:
+ http: ""
+ https: ""
+ no_proxy: []
+
node_ports:
drydock_api: 30000
maas_api: 30001
node_ports:
drydock_api: 30000
maas_api: 30001
@@
-73,13
+77,14
@@
data:
ntp:
servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org'
ntp:
servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org'
-
# Used for FQDN setup/definition
domain:
url: hpgen10.lab.akraino.org
ldap:
# Used for FQDN setup/definition
domain:
url: hpgen10.lab.akraino.org
ldap:
+ base_url: 'its-a-ldap.example.com'
url: 'ldap://its-a-ldap.example.com'
url: 'ldap://its-a-ldap.example.com'
+ auth_path: DC=test,DC=test,DC=com?sAMAccountName?sub?memberof=CN=test,OU=Application,OU=Groups,DC=test,DC=test,DC=com
common_name: AP-NC_Test_Users
subdomain: testitservices
domain: example
common_name: AP-NC_Test_Users
subdomain: testitservices
domain: example
@@
-89,8
+94,6
@@
data:
public_cidr: '172.31.1.0/24'
cluster_cidr: '172.31.1.0/24'
public_cidr: '172.31.1.0/24'
cluster_cidr: '172.31.1.0/24'
- # external: typically the floating IP subnet
- # tunnel: overlay network for VM traffic
neutron:
tunnel_device: 'bond0.45'
external_iface: 'bond0'
neutron:
tunnel_device: 'bond0.45'
external_iface: 'bond0'