Work in progress

roles/3scale/files/amp.json

@@ -285,11 +285,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -373,11 +369,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -470,11 +462,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -619,11 +607,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -750,11 +734,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -867,11 +847,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -963,11 +939,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -1145,11 +1117,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -1281,11 +1249,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -2007,11 +1971,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -2394,11 +2354,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -2613,11 +2569,7 @@
             ]
           }
         },
-        "triggers": [
+        "triggers": []
-          {
-            "type": "ConfigChange"
-          }
-        ]
       }
     },
     {
@@ -2630,11 +2582,7 @@
         "strategy": {
           "type": "Recreate"
         },
-        "triggers": [
+        "triggers": [],
-          {
-            "type": "ConfigChange"
-          }
-        ],
         "replicas": 0,
         "selector": {
           "name": "system-mysql"

roles/3scale/files/get-default-templates.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 #
-# This script gets the original 3scale template, converts it to JSON and
+# This script gets the original 3scale template, converts it to JSON,
-# scale down the DeploymentConfig's replicas to 0.
+# scales down the DeploymentConfig's replicas to 0 and disable triggers.
 #
 
 curl -s -o amp.yml https://raw.githubusercontent.com/3scale/3scale-amp-openshift-templates/2.0.0.GA/amp/amp.yml
-yaml2json amp.yml |jq '(.objects[]|select(.kind== "DeploymentConfig").spec.replicas) |= 0' > amp.json
+yaml2json amp.yml |jq '(.objects[]|select(.kind== "DeploymentConfig").spec.replicas) |= 0 | (.objects[]|select(.kind== "DeploymentConfig").spec.triggers) |= []' > amp.json

roles/3scale/tasks/main.yml

@@ -14,14 +14,17 @@
   - name: Get a list of existing projects
     command: oc get projects -o name
     register: oc_get_projects
+    changed_when: false
 
   - name: Create a new project for 3scale
     command: oc new-project "{{ threescale_options.project }}"
-    when: "project/" + threescale_options.project not in oc_get_projects.stdout_lines
+    when: '"project/" ~ threescale_options.project not in oc_get_projects.stdout_lines'
 
-  - name: Process the OpenShift Template and create the OpenShift objects for the hostpath-provisioner
+  - name: Process the OpenShift Template and create the OpenShift objects for the 3scale API Management Platform
     shell: oc process -f "{{ threescale_options.template }}" -p "TENANT_NAME={{ threescale_options.tenant_name }}" -p "WILDCARD_DOMAIN={{ threescale_options.wildcard_domain }}" | oc create -f - -n "{{ threescale_options.project }}"
 
+    # TODO
+
   - name: Get Admin Username
     command: oc get dc system-app -n "{{ threescale_options.project }}" -o 'jsonpath={.spec.template.spec.containers[0].env[?(@.name=="USER_LOGIN")].value}'
     register: username