Merge pull request #629 from akrzos/sno_public_vlan_address

Autoconfigure SNO public_vlan

Author: openshift-merge-bot[bot]

ansible/roles/create-inventory/tasks/main.yml

@@ -36,30 +36,28 @@
     ocpinventory_sno_nodes: []
     ocpinventory_hv_nodes: []
 
-- name: Public VLAN in MNO cluster
-  when: public_vlan and cluster_type == "mno"
+- name: Public VLAN autoconfiguration
+  when: public_vlan
   block:
   - name: Public VLAN - Set controlplane_network_interface_idx to -1 for the last interface
     set_fact:
       controlplane_network_interface_idx: "-1"
 
-  - name: Get assignment from scalelab quads
+  - name: Public VLAN - Get assignment from quads
     uri:
       url: "https://{{ labs[lab]['quads'] }}/api/v3/assignments/active/{{ lab_cloud }}"
       force_basic_auth: yes
       user: "{{ lab_cloud }}"
       password: "{{ ocpinventory.json.nodes[0].pm_password }}"
       validate_certs: false
     register: quads_assignment
-    when: lab == "scalelab" or lab == "performancelab"
 
-  - name: Public scalelab VLAN - Set addressing information
+  - name: Public VLAN - Set addressing information
     set_fact:
       controlplane_network: "{{ quads_assignment.json.vlan.ip_range }}"
       controlplane_network_prefix: "{{ quads_assignment.json.vlan.ip_range | ipaddr('prefix') }}"
       controlplane_network_gateway: "{{ quads_assignment.json.vlan.gateway }}"
       cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}"
-    when: lab == "scalelab" or lab == "performancelab"
 
 - name: Multi node cluster type tasks
   when: cluster_type == "mno"

ansible/roles/create-inventory/templates/inventory-sno.j2

@@ -41,15 +41,19 @@ bmc_password={{ bmc_password }}
 # one at a time by rerunning the SNO deploy playbook after changing which inventory line
 # is uncommented
 {% for sno in ocpinventory_sno_nodes %}
-{% set sno_long_hostname=sno.pm_addr | replace('mgmt-','') %}
-{% set sno_short_hostname=(sno_long_hostname.split('.')[0]) %}
-{% set lab_mac=(sno_foreman_data.results|selectattr('json.name', 'eq', sno_long_hostname)|first) | json_query(mac_query) | join(', ') %}
-{% if sno_use_lab_dhcp %}
-{%   set ip=(sno_foreman_data.results|selectattr('json.name', 'eq', sno_long_hostname)|first).json.ip %}
-{% else %}
-{%   set ip=controlplane_network | ansible.utils.nthhost(loop.index0 + 5) %}
-{% endif %}
-{% if not loop.first %}# {% endif %}{{ sno_short_hostname }} bmc_address={{ sno.pm_addr }} mac_address={{ sno.mac[controlplane_network_interface_idx] }} lab_mac={{ lab_mac }} ip={{ ip }} vendor={{ hw_vendor[(sno.pm_addr.split('.')[0]).split('-')[-1]] }} install_disk={{ sno_install_disk }} boot_iso={{ sno_short_hostname }}.iso
+{%   set sno_long_hostname=sno.pm_addr | replace('mgmt-','') %}
+{%   if public_vlan and loop.first %}
+{%     set sno_short_hostname=cluster_name %}
+{%   else %}
+{%     set sno_short_hostname=(sno_long_hostname.split('.')[0]) %}
+{%   endif %}
+{%   set lab_mac=(sno_foreman_data.results|selectattr('json.name', 'eq', sno_long_hostname)|first) | json_query(mac_query) | join(', ') %}
+{%   if sno_use_lab_dhcp %}
+{%     set ip=(sno_foreman_data.results|selectattr('json.name', 'eq', sno_long_hostname)|first).json.ip %}
+{%   else %}
+{%     set ip=controlplane_network | ansible.utils.nthhost(loop.index0 + 3) %}
+{%   endif %}
+{%   if not loop.first %}# {% endif %}{{ sno_short_hostname }} bmc_address={{ sno.pm_addr }} mac_address={{ sno.mac[controlplane_network_interface_idx|int] }} lab_mac={{ lab_mac }} ip={{ ip }} vendor={{ hw_vendor[(sno.pm_addr.split('.')[0]).split('-')[-1]] }} install_disk={{ sno_install_disk }} boot_iso={{ sno_short_hostname }}.iso
 {% endfor %}
 
 [sno:vars]

ansible/roles/validate-vars/tasks/main.yml

@@ -27,7 +27,16 @@
 - name: Validate public_vlan
   fail:
     msg: "Public vlan can only be set with non-byol Red Hat Labs."
-  when: (public_vlan | default(false)) and (lab == "byol")
+  when:
+  - public_vlan | default(false)
+  - lab == "byol"
+
+- name: Validate public_vlan and sno_use_lab_dhcp
+  fail:
+    msg: "public_vlan and sno_use_lab_dhcp can not both be true, only enable one or the other"
+  when:
+  - public_vlan | default(false)
+  - sno_use_lab_dhcp | default(false)
 
 - name: Check for RHEL/Centos (Bastion Validation)
   fail:

ansible/vars/all.sample.yml

@@ -24,13 +24,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard

docs/deploy-mno-byol.md

@@ -290,13 +290,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard

docs/deploy-mno-performancelab.md

@@ -363,13 +363,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard

docs/deploy-mno-scalelab.md

@@ -360,13 +360,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard

docs/deploy-sno-performancelab.md

@@ -362,13 +362,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard

docs/deploy-sno-scalelab.md

@@ -393,13 +393,15 @@ ocp_build: "ga"
 ocp_version: "latest-4.18"
 
 # Set to true ONLY if you have a public routable vlan in your scalelab or performancelab cloud.
-# MNO clusters autoconfigure cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
+# Autoconfigures cluster_name, base_dns_name, controlplane_network_interface_idx, controlplane_network,
 # controlplane_network_prefix, and controlplane_network_gateway to the values required for your cloud's public VLAN.
-# SNOs require manual configuration with additional variables.
+# SNO configures only the first cluster on the api dns resolvable address
+# MNO/SNO still requires the correct value for bastion_controlplane_interface
 public_vlan: false
 
 # SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
 # public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+# Cannot combine public_vlan and sno_use_lab_dhcp
 sno_use_lab_dhcp: false
 
 # Enables FIPs security standard