From c700639e5a29b1907976519918969b752d5be1e7 Mon Sep 17 00:00:00 2001 From: James Gu Date: Wed, 30 Sep 2020 16:06:14 -0700 Subject: Upgrade intel pod 15 to Airship 1.8 Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158 Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f Signed-off-by: James Gu --- site/intel-pod15/networks/common-addresses.yaml | 74 ++++++++++++++++++------- 1 file changed, 54 insertions(+), 20 deletions(-) (limited to 'site/intel-pod15/networks/common-addresses.yaml') diff --git a/site/intel-pod15/networks/common-addresses.yaml b/site/intel-pod15/networks/common-addresses.yaml index f4e8134..b991603 100644 --- a/site/intel-pod15/networks/common-addresses.yaml +++ b/site/intel-pod15/networks/common-addresses.yaml @@ -5,10 +5,16 @@ schema: pegleg/CommonAddresses/v1 metadata: schema: metadata/Document/v1 + replacement: true name: common-addresses layeringDefinition: abstract: false layer: site + parentSelector: + name: common-addresses-global + actions: + - method: merge + path: . storagePolicy: cleartext data: calico: @@ -18,24 +24,37 @@ data: # This should be whichever interface (or bond) and VLAN number specified in # networks/physical/networks.yaml for the Calico network. # E.g. you would set "interface=ens785f0" as shown here. - ip_autodetection_method: interface=ens785f1 + ip_autodetection_method: can-reach=10.10.152.21 etcd: # The etcd service IP address. # This address must be within data.kubernetes.service_cidr range service_ip: 10.96.232.136 + ip_rule: + # NEWSITE-CHANGEME: The service gateway/VRR IP for routing pod traffic + gateway: 10.10.152.1 - # NEWSITE-CHANGEME: Update virtual IPs to be used for deployment. - # These IPs are imporant and tied to FQDN/DNS registration for the site, see more at - # https://airship-treasuremap.readthedocs.io/en/latest/authoring_and_deployment.html#register-dns-names - vip: - # Used for accessing Airship/OpenStack APIs (ingress of kube-system) - # The address is selected from DMZ network specified in - # networks/physical/networks.yaml - ingress_vip: '10.10.150.100/32' - # Used for bare-metal deployment (PXE boot, fetching Drydock bootactions) - # The address is selected from Admin network specified in - # networks/physical/networks.yaml - maas_vip: '10.10.151.100/32' + bgp: + # on the genesis node, run /opt/cni/bin/calicoctl get bgppeers + # asnumber: 64688 + ipv4: + # NEWSITE-CHANGEME: A routable CIDR to configure for ingress, maas, and + # outward facing services (i.e. routable ingress CIDR) + # public_service_cidr: 10.10.150.128/29 + public_service_cidr: 10.10.150.128/29 + # NEWSITE-CHANGEME: Update with the "public" facing VIP to assign to + # the ingress controller. /32 is redundant; this is an IP not a CIDR. + ingress_vip: 10.10.150.129/32 + # NEWSITE-CHANGEME(v1.0.1): Update with the "public" facing VIP to assign + # the MAAS ingress controller. /32 is redundant; this is an IP not a CIDR. + maas_vip: 10.10.151.129/32 + # NEWSITE-CHANGEME: In Network Cloud, there is a pair of "global" BGP + # peers that will be used for the whole site (all racks). These BGP peer + # IPs should be put into this list. + # NOTE: Any change to the size of this list (2) requires corresponding + # changes in calico.yaml + peers: + - 'Nonsense' + - 'Nonsense' dns: # Kubernetes cluster domain. Do not change. This is internal to the cluster. @@ -45,11 +64,15 @@ data: # List of upstream DNS forwards. Verify you can reach them from your # environment. If so, you should not need to change them. upstream_servers: - - 8.8.8.8 - - 8.8.4.4 + - 10.10.150.20 + - 10.10.151.20 # Repeat the same values as above, but formatted as a common separated # string - upstream_servers_joined: 8.8.8.8,8.8.4.4 + upstream_servers_joined: 10.10.150.20, 10.10.151.20 + + # NEWSITE-CHANGEME: Set the FQDN used by bare metal nodes according to FQDN naming standards at + node_domain: intel-pod15.opnfv.org + # NEWSITE-CHANGEME: FQDN for ingress (i.e. "publicly facing" access point) # Choose FQDN according to the ingress/public FQDN naming conventions at # the top of this document. @@ -66,6 +89,10 @@ data: # NEWSITE-CHANGEME: Address defined for Calico network in # networks/physical/networks.yaml ip: 10.10.152.21 + # NEWSITE-CHANGEME: OOB IP of the Genesis node. This should be sourced from the + # engineering package and match the address used to access the iLO/iDRAC/ASMI + # interface for the Genesis node. + oob: 10.10.150.11 bootstrap: # NEWSITE-CHANGEME: Address defined for the Admin (PXE) network in @@ -117,7 +144,7 @@ data: # comma separated NTP server list. Verify that these upstream NTP servers are # reachable in your environment; otherwise update them with the correct # values for your environment. - servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org,4.ubuntu.pool.ntp.org' + servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org,3.ubuntu.pool.ntp.org' # An example for Openstack Helm Infra LDAP ldap: @@ -139,6 +166,13 @@ data: # deployment (test vs prod values, etc) domain: example + ldap: + # NEWSITE-CHANGEME: Replace with the site's LDAP account used to + # authenticate to the active directory backend to validate keystone + # users. + # It is NOT used in the example deployment. + username: "m12345@ldap.test.com" + storage: ceph: # NEWSITE-CHANGEME: CIDRs for Ceph. Update to match the network CIDR @@ -150,15 +184,15 @@ data: # NEWSITE-CHANGEME: Overlay network for VM traffic. Ensure the interface name and # VLAN number are consistent with what's defined for the Private network in # networks/physical/networks.yaml - tunnel_device: 'ens785f1' + tunnel_device: 'ens785f0' # Interface for the OpenStack external network. Ensure the interface name is # consistent with the interface and VLAN assigned to the Public network in # networks/physical/networks.yaml - external_iface: 'ens785f0.1153' + external_iface: 'ens785f1.1153' openvswitch: # Interface for the OpenStack external network. Ensure the interface name is # consistent with the interface and VLAN assigned to the Public network in # networks/physical/networks.yaml - external_iface: 'ens785f0.1153' + external_iface: 'ens785f1.1153' ... -- cgit 1.2.3-korg