Merge pull request #319 from masco/fix-ocp-ci

update the ocp ci file as per new changes

ci/ocp_install_vars.yml

@@ -1,8 +1,14 @@
+# Depending on cluster "type"
+# Hub cluster / Default
 osp_project_name: "{{ lookup('env', 'OSP_PROJECT_NAME')|default('shiftstack', true) }}"
 osp_user_name: "{{ lookup('env', 'OSP_USER_NAME')|default('shiftstack_user', true) }}"
+# Spoke cluster(s):
+# osp_project_name: "shiftstack{{ocp_cluster_index}}"
+# osp_user_name: "shiftstack{{ocp_cluster_index}}"
 
 ocp_release: "{{ lookup('env', 'OPENSHIFT_RELEASE')|default('4.4.6', true) }}"
 install_client: true
+# Do not allow ocp_cluster_name to exceed 14 characters!!!!
 ocp_cluster_name: "{{ lookup('env', 'OPENSHIFT_CLUSTER_NAME')|default('vlan609', true) }}"
 ocp_base_domain: "{{ lookup('env', 'OPENSHIFT_BASE_DOMAIN')|default('rdu2.scalelab.redhat.com', true) }}"
 
@@ -18,7 +24,14 @@ worker_nodes: "{{ lookup('env', 'OPENSHIFT_WORKER_COUNT')|default(5, true) }}"
 # specify the openshift SDN name, OpenShiftSDN or Kuryr
 ocp_network_type: "{{ lookup('env', 'OPENSHIFT_NETWORK_TYPE')|default('Kuryr', true) }}"
 
+# if the master has a passthrough nvme, set to true to use this device for etcd
+ocp_master_etcd_nvme: false
+passthrough_nvme_device: /dev/nvme0n1
+
 ssh_key_file: "{{ lookup('env', 'OPENSHIFT_INSTALL_SSH_PUB_KEY_FILE')|default('~/.ssh/id_rsa.pub', true) }}"
+
+# when pull secret is not enabled it will try to read from the value
+# from OPENSHIFT_INSTALL_PULL_SECRET env variable
 #ocp_pull_secret: "{{ lookup('env', 'OPENSHIFT_INSTALL_PULL_SECRET')| to_yaml }}"
 
 ocp_create_infra_nodes: "{{ lookup('env', 'OPENSHIFT_TOGGLE_INFRA_NODE')|default(true, true) }}"