Some cleanup

loganmc10 · Oct 24, 2022 · 3aac6d0 · 3aac6d0
1 parent d692c74
commit 3aac6d0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/common/roles/install_operator/tasks/main.yaml b/common/roles/install_operator/tasks/main.yaml
@@ -12,15 +12,7 @@
 
 - name: Create OperatorGroup
   kubernetes.core.k8s:
-    definition:
-      apiVersion: operators.coreos.com/v1
-      kind: OperatorGroup
-      metadata:
-        name: "{{ operator_name }}"
-        namespace: "{{ operator_namespace }}"
-      spec:
-        targetNamespaces:
-          - "{{ operator_namespace }}"
+    template: OperatorGroup.yaml.j2
     apply: true
     state: present
 

diff --git a/common/roles/install_operator/templates/OperatorGroup.yaml.j2 b/common/roles/install_operator/templates/OperatorGroup.yaml.j2
@@ -0,0 +1,10 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: "{{ operator_name }}"
+  namespace: "{{ operator_namespace }}"
+{% if not all_namespaces %}
+spec:
+  targetNamespaces:
+    - "{{ operator_namespace }}"
+{% endif %}
diff --git a/common/roles/storage/tasks/main.yaml b/common/roles/storage/tasks/main.yaml
@@ -30,6 +30,7 @@
       vars:
         operator_name: local-storage-operator
         operator_namespace: openshift-local-storage
+        all_namespaces: false
 
     - name: Get node list
       kubernetes.core.k8s_info:

diff --git a/common/roles/storage/tasks/storage_lvm.yaml b/common/roles/storage/tasks/storage_lvm.yaml
@@ -4,6 +4,7 @@
   vars:
     operator_name: odf-lvm-operator
     operator_namespace: openshift-storage
+    all_namespaces: false
 
 - name: Install ODF LVMCluster
   kubernetes.core.k8s:

diff --git a/common/roles/storage/tasks/storage_odf.yaml b/common/roles/storage/tasks/storage_odf.yaml
@@ -39,6 +39,7 @@
   vars:
     operator_name: ocs-operator
     operator_namespace: openshift-storage
+    all_namespaces: false
 
 - name: Create StorageCluster
   kubernetes.core.k8s:

diff --git a/edge/roles/edge_install/tasks/setup_host_networking.yaml b/edge/roles/edge_install/tasks/setup_host_networking.yaml
@@ -21,7 +21,7 @@
         (nmstate_host.networkConfig.interfaces[relocatable_interface].ipv4 is defined) and
         (nmstate_host.networkConfig.interfaces[relocatable_interface].ipv4.enabled)
       block:
-        - name: Ensure address array exists
+        - name: Ensure ipv4 array exists
           when: nmstate_config.result.spec.config.interfaces[relocatable_interface].ipv4.address is not defined
           kubernetes.core.k8s_json_patch:
             api_version: agent-install.openshift.io/v1beta1
@@ -33,7 +33,7 @@
                 path: /spec/config/interfaces/{{ relocatable_interface | int }}/ipv4/address
                 value: []
 
-        - name: Add secondary address
+        - name: Add secondary ipv4 address
           kubernetes.core.k8s_json_patch:
             api_version: agent-install.openshift.io/v1beta1
             kind: NMStateConfig
@@ -53,7 +53,7 @@
         (nmstate_host.networkConfig.interfaces[relocatable_interface].ipv6 is defined) and
         (nmstate_host.networkConfig.interfaces[relocatable_interface].ipv6.enabled)
       block:
-        - name: Ensure address array exists
+        - name: Ensure ipv6 array exists
           when: nmstate_config.result.spec.config.interfaces[relocatable_interface].ipv6.address is not defined
           kubernetes.core.k8s_json_patch:
             api_version: agent-install.openshift.io/v1beta1
@@ -65,7 +65,7 @@
                 path: /spec/config/interfaces/{{ relocatable_interface | int }}/ipv6/address
                 value: []
 
-        - name: Add secondary address
+        - name: Add secondary ipv6 address
           kubernetes.core.k8s_json_patch:
             api_version: agent-install.openshift.io/v1beta1
             kind: NMStateConfig

diff --git a/provisioning/roles/provisioning_mce/tasks/main.yaml b/provisioning/roles/provisioning_mce/tasks/main.yaml
@@ -20,6 +20,7 @@
       vars:
         operator_name: multicluster-engine
         operator_namespace: multicluster-engine
+        all_namespaces: false
 
     - name: Create MCE
       kubernetes.core.k8s: