Calico: update files to handle multi-asn bgp peering conditions. (#6971)

* update files to handle multi-asn bgp peering conditions.

* put back in the serviceClusterIPs.  Bad merge.

* remove extraneous environment var.

* update files as discussed with mirwan

* update titles.

* add not in.

* add a conditional for using bgp to advertise cluster ips.

Co-authored-by: marlow-h <mweston@habana.ai>

roles/network_plugin/calico/tasks/install.yml

@@ -168,7 +168,7 @@
     - inventory_hostname in groups['k8s-cluster']
   run_once: yes
 
-- name: Calico | Set global as_num
+- name: Calico | Set up BGP Configuration
   command:
     cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
     stdin: >
@@ -179,9 +179,10 @@
       },
       "spec": {
           "logSeverityScreen": "Info",
+          {% if not calico_no_global_as_num|default(false) %}"asNumber": {{ global_as_num }},{% endif %}
           "nodeToNodeMeshEnabled": {{ nodeToNodeMeshEnabled|default('true') }} ,
-          "serviceExternalIPs": {{ _service_external_ips|default([]) }},
-          "asNumber": {{ global_as_num }} }}
+          {% if calico_advertise_cluster_ips|default(false) %}"serviceClusterIPs": [{"cidr": {{ kube_service_addresses }} }],{% endif %}
+          "serviceExternalIPs": {{ _service_external_ips|default([]) }} }}
   changed_when: false
   when:
     - inventory_hostname == groups['kube-master'][0]