Added disable_service_vlan_preprovisioning to acc-provision

provision/acc_provision/templates/aci-containers.yaml

@@ -2690,6 +2690,9 @@ data:
         {% if config.kube_config.apic_connection_retry_limit %}
         "apic-connection-retry-limit": {{ config.kube_config.apic_connection_retry_limit|json}},
         {% endif %}
+        {% if config.kube_config.disable_service_vlan_preprovisioning %}
+        "disable-service-vlan-preprovisioning": {{ config.kube_config.disable_service_vlan_preprovisioning|json }},
+        {% endif %}
 {#
         Commenting code to disable the install_istio flag as the functionality
         is disabled to remove dependency from istio.io/istio package.

provision/acc_provision/templates/provision-config.yaml

@@ -162,6 +162,7 @@ registry:
   # enable_hpp_direct: True                             # default is False, set to True to enable HPP distribution via Kubernetes control plane for faster convergence and reduce load on fabric
   # unknown_mac_unicast_action: "flood"                 # override if needed, default is "proxy"
   # opflex_agent_reset_wait_delay: 10                   # override if needed, default is 5
+  # disable_service_vlan_preprovisioning : True        # default is False, set to True if you want to disable proactive vlan programming on all OpenStack compute hosts when using the OpenShift-on-OpenStack deployment model
 
 #
 # Configuration for ACI CNI Operator

provision/testdata/with_overrides.apic.txt

@@ -190,7 +190,7 @@ None
             {
                 "vmmInjectedClusterDetails": {
                     "attributes": {
-                        "accProvisionInput": "operator_managed_config:\n  enable_updates: true\naci_config:\n  system_id: kube\n  use_legacy_kube_naming_convention: true\n  cluster_tenant: demo\n  apic_hosts:\n  - 10.30.120.100\n  apic_login:\n    username: admin\n  apic_version: '5.0'\n  aep: kube-aep\n  apic_subscription_delay: 100\n  opflex_device_delete_timeout: 1200\n  apic_refreshticker_adjust: 150\n  vrf:\n    name: kubernetes-vrf\n    tenant: common\n  l3out:\n    name: l3out\n    external_networks:\n    - l3out\n  physical_domain:\n    domain: kubernetes-control\n  sync_login:\n    certfile: user.crt\n    keyfile: user.key\n  vmm_domain:\n    domain: kubernetes1\n    controller: kubernetes1\n    encap_type: vxlan\n    mcast_range:\n      start: 225.2.1.1\n      end: 225.2.255.255\n  client_ssl: false\nnet_config:\n  node_subnet: 10.1.0.1/16\n  pod_subnet: 10.2.0.1/16\n  pod_subnet_chunk_size: 24\n  extern_dynamic: 10.4.0.1/16\n  extern_static: 10.3.0.1/24\n  node_svc_subnet: 10.6.0.1/24\n  kubeapi_vlan: 4001\n  service_vlan: 4003\n  infra_vlan: 4093\n  disable_wait_for_network: true\nkube_config:\n  aci_multipod: true\n  opflex_device_reconnect_wait_timeout: 10\n  dhcp_renew_max_retry_count: 10\n  dhcp_delay: 10\n  use_external_service_ip_allocator: true\n  use_privileged_containers: true\n  use_openshift_security_context_constraints: true\n  allow_kube_api_default_epg: true\n  no_wait_for_service_ep_readiness: true\n  hpp_optimization: true\n  service_graph_endpoint_add_delay:\n    delay: 30\n    services:\n    - name: ingress-service\n      namespace: openshift-ingress\n    - name: monitoring-service\n      namespace: openshift-monitoring\n      delay: 60\n  add_external_subnets_to_rdconfig: true\n  snat_operator:\n    disable_periodic_snat_global_info_sync: true\n    sleep_time_snat_global_info_sync: 60\n  node_snat_redirect_exclude:\n  - group: router\n    labels:\n    - worker\n    - router\n    - infra\n  - group: infra\n    labels:\n    - infra\n    - router\n  image_pull_policy: IfNotPresent\n  opflex_agent_policy_retry_delay_timer: 10\n  use_system_node_priority_class: true\n  ovs_memory_request: 512Mi\n  ovs_memory_limit: 2Gi\n  aci_containers_controller_memory_request: 256Mi\n  aci_containers_controller_memory_limit: 5Gi\n  aci_containers_host_memory_request: 256Mi\n  aci_containers_host_memory_limit: 5Gi\n  mcast_daemon_memory_request: 256Mi\n  mcast_daemon_memory_limit: 5Gi\n  opflex_agent_memory_request: 256Mi\n  opflex_agent_memory_limit: 5Gi\n  acc_provision_operator_memory_request: 256Mi\n  acc_provision_operator_memory_limit: 5Gi\n  aci_containers_operator_memory_request: 256Mi\n  aci_containers_operator_memory_limit: 5Gi\n  toleration_seconds: 100\n  opflex_openssl_compat: true\n  enable_opflex_agent_reconnect: true\n  opflex_agent_statistics: false\n  opflex_startup_enabled: true\n  opflex_startup_policy_duration: 20\n  opflex_startup_resolve_aft_conn: true\n  opflex_switch_sync_delay: 10\n  opflex_switch_sync_dynamic: 20\n  add_external_contract_to_default_epg: true\n  apic_connection_retry_limit: 10\n  disable_hpp_rendering: true\n  taint_not_ready_node: true\n  enable_hpp_direct: true\n  unknown_mac_unicast_action: flood\n  opflex_agent_reset_wait_delay: 10\nregistry:\n  image_prefix: noiro\n  aci_cni_operator_version: AciCniOperatorTag\n  use_digest: true\nlogging:\n  controller_log_level: debug\n  hostagent_log_level: debug\n  opflexagent_log_level: info\n  operator_log_level: debug\nnodepodif_config:\n  enable: true\ndrop_log_config:\n  disable_events: true\n",
+                        "accProvisionInput": "operator_managed_config:\n  enable_updates: true\naci_config:\n  system_id: kube\n  use_legacy_kube_naming_convention: true\n  cluster_tenant: demo\n  apic_hosts:\n  - 10.30.120.100\n  apic_login:\n    username: admin\n  apic_version: '5.0'\n  aep: kube-aep\n  apic_subscription_delay: 100\n  opflex_device_delete_timeout: 1200\n  apic_refreshticker_adjust: 150\n  vrf:\n    name: kubernetes-vrf\n    tenant: common\n  l3out:\n    name: l3out\n    external_networks:\n    - l3out\n  physical_domain:\n    domain: kubernetes-control\n  sync_login:\n    certfile: user.crt\n    keyfile: user.key\n  vmm_domain:\n    domain: kubernetes1\n    controller: kubernetes1\n    encap_type: vxlan\n    mcast_range:\n      start: 225.2.1.1\n      end: 225.2.255.255\n  client_ssl: false\nnet_config:\n  node_subnet: 10.1.0.1/16\n  pod_subnet: 10.2.0.1/16\n  pod_subnet_chunk_size: 24\n  extern_dynamic: 10.4.0.1/16\n  extern_static: 10.3.0.1/24\n  node_svc_subnet: 10.6.0.1/24\n  kubeapi_vlan: 4001\n  service_vlan: 4003\n  infra_vlan: 4093\n  disable_wait_for_network: true\nkube_config:\n  aci_multipod: true\n  opflex_device_reconnect_wait_timeout: 10\n  dhcp_renew_max_retry_count: 10\n  dhcp_delay: 10\n  use_external_service_ip_allocator: true\n  use_privileged_containers: true\n  use_openshift_security_context_constraints: true\n  allow_kube_api_default_epg: true\n  no_wait_for_service_ep_readiness: true\n  hpp_optimization: true\n  service_graph_endpoint_add_delay:\n    delay: 30\n    services:\n    - name: ingress-service\n      namespace: openshift-ingress\n    - name: monitoring-service\n      namespace: openshift-monitoring\n      delay: 60\n  add_external_subnets_to_rdconfig: true\n  snat_operator:\n    disable_periodic_snat_global_info_sync: true\n    sleep_time_snat_global_info_sync: 60\n  node_snat_redirect_exclude:\n  - group: router\n    labels:\n    - worker\n    - router\n    - infra\n  - group: infra\n    labels:\n    - infra\n    - router\n  image_pull_policy: IfNotPresent\n  opflex_agent_policy_retry_delay_timer: 10\n  use_system_node_priority_class: true\n  ovs_memory_request: 512Mi\n  ovs_memory_limit: 2Gi\n  aci_containers_controller_memory_request: 256Mi\n  aci_containers_controller_memory_limit: 5Gi\n  aci_containers_host_memory_request: 256Mi\n  aci_containers_host_memory_limit: 5Gi\n  mcast_daemon_memory_request: 256Mi\n  mcast_daemon_memory_limit: 5Gi\n  opflex_agent_memory_request: 256Mi\n  opflex_agent_memory_limit: 5Gi\n  acc_provision_operator_memory_request: 256Mi\n  acc_provision_operator_memory_limit: 5Gi\n  aci_containers_operator_memory_request: 256Mi\n  aci_containers_operator_memory_limit: 5Gi\n  toleration_seconds: 100\n  opflex_openssl_compat: true\n  enable_opflex_agent_reconnect: true\n  opflex_agent_statistics: false\n  opflex_startup_enabled: true\n  opflex_startup_policy_duration: 20\n  opflex_startup_resolve_aft_conn: true\n  opflex_switch_sync_delay: 10\n  opflex_switch_sync_dynamic: 20\n  add_external_contract_to_default_epg: true\n  apic_connection_retry_limit: 10\n  disable_hpp_rendering: true\n  taint_not_ready_node: true\n  enable_hpp_direct: true\n  unknown_mac_unicast_action: flood\n  opflex_agent_reset_wait_delay: 10\n  disable_service_vlan_preprovisioning: true\nregistry:\n  image_prefix: noiro\n  aci_cni_operator_version: AciCniOperatorTag\n  use_digest: true\nlogging:\n  controller_log_level: debug\n  hostagent_log_level: debug\n  opflexagent_log_level: info\n  operator_log_level: debug\nnodepodif_config:\n  enable: true\ndrop_log_config:\n  disable_events: true\n",
                         "userKey": "dummy\n",
                         "userCert": "dummy\n"
                     }

provision/testdata/with_overrides.inp.yaml

@@ -114,6 +114,7 @@ kube_config:
   enable_hpp_direct: True
   unknown_mac_unicast_action: "flood"
   opflex_agent_reset_wait_delay: 10
+  disable_service_vlan_preprovisioning: True
 
 registry:
   image_prefix: noiro