X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fnetworks%2Fcommon-addresses.j2;fp=templates%2Faic-clcp-manifests%2Fnetworks%2Fcommon-addresses.j2;h=c38ca28befb09b3ffb297abce9508f36a391a81f;hb=refs%2Fchanges%2F69%2F369%2F1;hp=2f00c5fc6e4f042c8da8948838ae3aa67d225c71;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/networks/common-addresses.j2 b/templates/networks/common-addresses.j2
similarity index 71%
rename from templates/aic-clcp-manifests/networks/common-addresses.j2
rename to templates/networks/common-addresses.j2
index 2f00c5f..c38ca28 100644
--- a/templates/aic-clcp-manifests/networks/common-addresses.j2
+++ b/templates/networks/common-addresses.j2
@@ -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.                   #
@@ -33,11 +33,11 @@ data:
     cluster_domain: cluster.local
     service_ip: 10.96.0.10
     upstream_servers:
-      - 135.37.9.16
-      - 135.38.244.16
-      - 135.188.34.84
-    upstream_servers_joined: 135.37.9.16,135.38.244.16,135.53.34.84
-
+{% for server in yaml.dns.upstream_servers %}
+      - {{server}}
+{% endfor %}
+    upstream_servers_joined: '{{yaml.dns.upstream_servers_joined}}'
+    ingress_domain: {{yaml.dns.ingress_domain}}
   genesis:
     hostname: {{yaml.genesis.name}}
     ip: {{yaml.genesis.ksn}}
@@ -52,7 +52,7 @@ data:
     service_cidr: {{yaml.kubernetes.service_cidr}}
     apiserver_port: 6443
     haproxy_port: 6553
-    service_node_port_range: 30000-35357
+    service_node_port_range: 30000-32767
 
   etcd:
     container_port: 2379
@@ -63,25 +63,32 @@ data:
     - hostname: {{master.name}}
 {% endfor %}
 
-  workers:
-{% for worker in yaml.workers %}
-    - hostname: {{worker.name}}
-{% endfor %}
-
   proxy:
-    http: http://one.proxy.att.com:8080
-    https: http://one.proxy.att.com:8080
-    no_proxy: '{{yaml.kubernetes.api_service_ip}},*.cluster.local,{{yaml.genesis.host}}{%for server in yaml.servers%},{{server.host}}{% endfor %}'
+    http: ""
+    https: ""
+    no_proxy: []
 
   node_ports:
     drydock_api: 30000
     maas_api: 30001
-    maas_proxy: 31800  # hardcoded in maas
+    maas_proxy: 31800  # hardcoded in MAAS
     shipyard_api: 30003
     airflow_web: 30004
 
   ntp:
-    servers_joined: '135.25.154.100'
+    servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org'
+
+  # Used for FQDN setup/definition
+  domain:
+    url: {{yaml.site_name}}.lab.akraino.org
+
+  ldap:
+    base_url: '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
 
   storage:
     ceph:
@@ -90,8 +97,8 @@ data:
 
   neutron:
     tunnel_device: '{{yaml.networks.neutron.interface}}'
-    external_iface: '{{yaml.networks.neutron.interface}}'
+    external_iface: '{{yaml.networks.primary}}'
 
   openvswitch:
-    external_iface: '{{yaml.networks.neutron.interface}}'
+    external_iface: '{{yaml.networks.primary}}'
 ...