minor fixes

support/docker/deploy-api.yaml

@@ -7,8 +7,8 @@
     # By default, the 3scale admin portal hostname and its access token are taken
     # from a Kubernetes secret but they can be overriden from the command line
     # as extra vars (-e threescale_portal_hostname=... -e threescale_cicd_access_token=...)
-    threescale_portal_hostname: 'lookup(''file'', ''/tmp/secrets/hostname'')'
+    threescale_portal_hostname: '{{ lookup(''file'', ''/tmp/secrets/hostname'') }}'
-    threescale_cicd_access_token: 'lookup(''file'', ''/tmp/secrets/access_token'')'
+    threescale_cicd_access_token: '{{ lookup(''file'', ''/tmp/secrets/access_token'') }}'
   tasks:
   - assert:
       that: threescale_portal_hostname is defined
@@ -46,7 +46,7 @@
 
     # By default, the Red Hat SSO Issuer Endpoint are taken from a Kubernetes secret
     # but they can be overriden from the command line as extra vars (-e threescale_cicd_sso_issuer_endpoint=...)
-    threescale_cicd_sso_issuer_endpoint: 'lookup(''file'', ''/tmp/secrets/sso_issuer_endpoint'')'
+    threescale_cicd_sso_issuer_endpoint: '{{ lookup(''file'', ''/tmp/secrets/sso_issuer_endpoint'') }}'
 
     ansible_connection: local
     parameter_whitelist:

support/docker/openshift-template.yaml

@@ -36,10 +36,10 @@ parameters:
   description: The format (JSON or YAML) of the OpenAPI Specification file
   value: YAML
   required: false
-- name: 3SCALE_ADMIN_PORTAL_HOSTNAME
+- name: THREESCALE_ADMIN_PORTAL_HOSTNAME
   description: The hostname of the 3scale admin portal (bare hostname, without https://)
   required: true
-- name: 3SCALE_ADMIN_PORTAL_ACCESS_TOKEN
+- name: THREESCALE_ADMIN_PORTAL_ACCESS_TOKEN
   description: The 3scale access token
   required: true
 - name: SSO_ISSUER_ENDPOINT
@@ -54,6 +54,7 @@ objects:
   metadata:
     name: threescale-cicd
   spec:
+    tags:
     - name: latest
       annotations:
       referencePolicy:
@@ -90,6 +91,8 @@ objects:
         env:
         - name: THREESCALE_CICD_OPENAPI_FILE_FORMAT
           value: ${API_OPENAPI_FILE_FORMAT}
+        - name: THREESCALE_CICD_OPENAPI_FILE
+          value: ${API_OPENAPI_FILE}
         - name: THREESCALE_CICD_API_BASE_SYSTEM_NAME
           value: ${API_NAME}
         secrets:
@@ -105,6 +108,6 @@ objects:
     name: 3scale-admin-portal-${API_NAME}
   type: Opaque 
   stringData: 
-    hostname: ${3SCALE_ADMIN_PORTAL_HOSTNAME}
+    hostname: ${THREESCALE_ADMIN_PORTAL_HOSTNAME}
-    access_token: ${3SCALE_ADMIN_PORTAL_ACCESS_TOKEN}
+    access_token: ${THREESCALE_ADMIN_PORTAL_ACCESS_TOKEN}
     sso_issuer_endpoint: ${SSO_ISSUER_ENDPOINT}