added default value for architecture and made restricted_network_upgrade as boolean

Signed-off-by: sajauddin <[email protected]>

Author: sajauddin

playbooks/roles/ocp-upgrade/README.md

@@ -27,7 +27,7 @@ Role Variables
 | pause_time                 | no       | 90                | Pauses playbook execution for a set amount of time in minutes |
 | delay_time                 | no       | 600               | Number of seconds to wait before starting to poll     |
 | restricted_network_upgrade | no       | false             | Set to true to upgrade the restricted network cluster |
-| architecture               | no       | ""                | Architecture of the cluster eg. ppc64le               |
+| architecture               | no       | "ppc64le"         | Architecture of the cluster.                          |
 | local_secret               | no       | ""                | Path to pull secret of the registry                   |
 | local_registry             | no       | ""                | Specify the local registry name along with port for your mirror repository eg. registry.test-ocp-600b.ibm.com:5000 |
 | local_repository           | no       | "ocp4/openshift4" | Name of the repository to create in your registry eg. ocp4/openshift4 |

playbooks/roles/ocp-upgrade/defaults/main.yaml

@@ -10,8 +10,8 @@ upgrade_channel: ""
 upgrade_image: ""
 pause_time: 90
 delay_time: 600
-restricted_network_upgrade: "false"
-architecture: ""
+restricted_network_upgrade: false
+architecture: "ppc64le"
 local_secret: ""
 local_registry: ""
 local_repository: "ocp4/openshift4"

playbooks/roles/ocp-upgrade/tasks/main.yaml

@@ -29,7 +29,7 @@
   when:
   - upgrade_version != "" and upgrade_image == ""
   - eus_upgrade_channel == "" and eus_upgrade_image == ""
-  - restricted_network_upgrade != "true"
+  - not restricted_network_upgrade
 
 - name: Upgrade ocp using a release image
   block:
@@ -51,7 +51,7 @@
   when: 
   - upgrade_image != ""
   - eus_upgrade_channel == "" and eus_upgrade_image == ""
-  - restricted_network_upgrade != "true"
+  - not restricted_network_upgrade
 
 - name: EUS to EUS upgrades 
   include_tasks: "{{ role_path }}/tasks/eus_upgrades.yaml"
@@ -62,7 +62,6 @@
 - name: Update restricted network ocp cluster
   include_tasks: "{{ role_path }}/tasks/restricted_network_upgrade.yaml"
   when:
-    - restricted_network_upgrade == "true"
+    - restricted_network_upgrade
     - upgrade_version != ""
-    - architecture != ""
     - local_registry != "" and local_repository != "" and local_secret != ""