Update reference to source policy crs

Signed-off-by: melserngawy <[email protected]>
cynepco3hahue · May 6, 2021 · 7f44ae3 · 7f44ae3
1 parent b22378a
commit 7f44ae3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/ztp/ztp-policy-generator/policyGenerator.yaml b/ztp/ztp-policy-generator/policyGenerator.yaml
@@ -4,5 +4,5 @@ metadata:
   name: acm-policy
   namespace: acm-policy-generator
 # The arguments should be given and defined as below with same order --policyGenTempPath= --sourcePath= --outPath= --stdout --customResources
-argsOneLiner: ./ranPolicyGenTempExamples ./sourcePolicies ./out true false
+argsOneLiner: ./ranPolicyGenTempExamples ../source-policy-crs ./out true false
 
diff --git a/ztp/ztp-policy-generator/ranPolicyGenTempExamples/common-ranGen.yaml b/ztp/ztp-policy-generator/ranPolicyGenTempExamples/common-ranGen.yaml
@@ -37,3 +37,13 @@ sourceFiles:
     policyName: "pao-sub-catalog-policy"
   - fileName: ClusterLogSubscription
     policyName: "log-sub-policy"
+  - fileName: MachineConfigContainerMountNS
+    policyName: "worker-mc-mount-ns-policy"
+    name: "02-worker-container-mount-namespace"
+    labels:
+      machineconfiguration.openshift.io/role: worker
+  - fileName: MachineConfigContainerMountNS
+    policyName: "master-mc-mount-ns-policy"
+    name: "02-master-container-mount-namespace"
+    labels:
+      machineconfiguration.openshift.io/role: master
diff --git a/ztp/ztp-policy-generator/ranPolicyGenTempExamples/group-du-ranGen.yaml b/ztp/ztp-policy-generator/ranPolicyGenTempExamples/group-du-ranGen.yaml
@@ -14,20 +14,3 @@ metadata:
 sourceFiles:
   - fileName: MachineConfigPool
     policyName: "mcp-worker-du-policy"
-  - fileName: SriovOperatorConfig
-    policyName: "sriov-operconfig-policy"
-  - fileName: MachineConfigSctp
-    policyName: "mc-sctp-policy"
-  - fileName: MachineConfigContainerMountNS
-    policyName: "mc-mount-ns-policy"
-  - fileName: MachineConfigDisableChronyd
-    policyName: "mc-chronyd-policy"
-  - fileName: PtpConfigSlave
-    policyName: "ptp-config-policy"
-    name: "du-ptp-slave"
-    spec:
-      profile:
-      - name: "slave"
-        interface: "ens5f0"
-        ptp4lOpts: "-2 -s --summary_interval -4"
-        phc2sysOpts: "-a -r -n 24"
diff --git a/ztp/ztp-policy-generator/ranPolicyGenTempExamples/group-du-sno-ranGen.yaml b/ztp/ztp-policy-generator/ranPolicyGenTempExamples/group-du-sno-ranGen.yaml
@@ -14,15 +14,14 @@ metadata:
 sourceFiles:
   - fileName: ConsoleOperatorDisable
     policyName: "console-policy"
-    name: "N/A"
   # Set ClusterLogForwarder & ClusterLogging as example might be better to create another policyTemp-Group
   - fileName: ClusterLogForwarder
     policyName: "log-forwarder-policy"
-    name: "N/A"
     spec:
       outputs:
         - type: "kafka"
           name: kafka-open
+          # below url is an example
           url: tcp://10.46.55.190:9092/test
       pipelines:
         - name: audit-logs
@@ -37,7 +36,6 @@ sourceFiles:
            - kafka-open
   - fileName: ClusterLogging
     policyName: "log-policy"
-    name: "N/A"
     spec:
       curation:
         curator:
@@ -46,3 +44,20 @@ sourceFiles:
         logs:
           type: "fluentd"
           fluentd: {}
+  - fileName: MachineConfigSctp
+    policyName: "mc-sctp-policy"
+    labels:
+      machineconfiguration.openshift.io/role: master
+  - fileName: MachineConfigDisableChronyd
+    policyName: "mc-chronyd-policy"
+  - fileName: PtpConfigSlave
+    policyName: "ptp-config-policy"
+    name: "du-ptp-slave"
+    spec:
+      profile:
+      - name: "slave"
+        interface: "ens5f0"
+        ptp4lOpts: "-2 -s --summary_interval -4"
+        phc2sysOpts: "-a -r -n 24"
+  - fileName: SriovOperatorConfig
+    policyName: "sriov-operconfig-policy"
diff --git a/ztp/ztp-policy-generator/ranPolicyGenTempExamples/site-du-sno-1-ranGen.yaml b/ztp/ztp-policy-generator/ranPolicyGenTempExamples/site-du-sno-1-ranGen.yaml
@@ -9,7 +9,7 @@ metadata:
     common: false
     groupName: "N/A"
     siteName: "site-du-sno-1"
-    mcp: worker-du
+    mcp: master
 sourceFiles:
   - fileName: SriovNetwork
     policyName: "sriov-nw-fh-policy"
@@ -18,7 +18,7 @@ sourceFiles:
       resourceName: du_fh
       vlan: 140
   - fileName: SriovNetworkNodePolicy
-    policyName: "sriov-nn-fh-policy"
+    policyName: "sriov-nnp-fh-policy"
     name: "sriov-nnp-du-fh"
     spec:
       deviceType: netdevice