From bb26c5c168285accbe629d88cbd73fb4436696ef Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Thu, 15 Feb 2018 10:14:50 -0500 Subject: [PATCH 1/2] Update templates to mount the configmap into the directory the new image expects https://github.com/ManageIQ/manageiq-pods/pull/264 --- .../files/examples/v3.7/cfme-templates/cfme-template.yaml | 8 +------- .../files/examples/v3.9/cfme-templates/cfme-template.yaml | 8 +------- .../files/templates/cloudforms/cfme-template.yaml | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml index 5c757b6c2dc..b05e32055fd 100644 --- a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml +++ b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml @@ -639,7 +639,7 @@ objects: - name: cfme-pgdb-volume mountPath: "/var/lib/pgsql/data" - name: cfme-pg-configs - mountPath: "${POSTGRESQL_CONFIG_DIR}" + mountPath: "/opt/app-root/src/postgresql-config/" env: - name: POSTGRESQL_USER value: "${DATABASE_USER}" @@ -654,8 +654,6 @@ objects: value: "${POSTGRESQL_MAX_CONNECTIONS}" - name: POSTGRESQL_SHARED_BUFFERS value: "${POSTGRESQL_SHARED_BUFFERS}" - - name: POSTGRESQL_CONFIG_DIR - value: "${POSTGRESQL_CONFIG_DIR}" resources: requests: memory: "${POSTGRESQL_MEM_REQ}" @@ -928,10 +926,6 @@ parameters: displayName: Memcached Slab Page Size description: Memcached size of each slab page. value: 1m -- name: POSTGRESQL_CONFIG_DIR - displayName: PostgreSQL Configuration Overrides - description: Directory used to store PostgreSQL configuration overrides. - value: "/var/lib/pgsql/conf.d" - name: POSTGRESQL_MAX_CONNECTIONS displayName: PostgreSQL Max Connections description: PostgreSQL maximum number of database connections allowed. diff --git a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml index 5c757b6c2dc..b05e32055fd 100644 --- a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml +++ b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml @@ -639,7 +639,7 @@ objects: - name: cfme-pgdb-volume mountPath: "/var/lib/pgsql/data" - name: cfme-pg-configs - mountPath: "${POSTGRESQL_CONFIG_DIR}" + mountPath: "/opt/app-root/src/postgresql-config/" env: - name: POSTGRESQL_USER value: "${DATABASE_USER}" @@ -654,8 +654,6 @@ objects: value: "${POSTGRESQL_MAX_CONNECTIONS}" - name: POSTGRESQL_SHARED_BUFFERS value: "${POSTGRESQL_SHARED_BUFFERS}" - - name: POSTGRESQL_CONFIG_DIR - value: "${POSTGRESQL_CONFIG_DIR}" resources: requests: memory: "${POSTGRESQL_MEM_REQ}" @@ -928,10 +926,6 @@ parameters: displayName: Memcached Slab Page Size description: Memcached size of each slab page. value: 1m -- name: POSTGRESQL_CONFIG_DIR - displayName: PostgreSQL Configuration Overrides - description: Directory used to store PostgreSQL configuration overrides. - value: "/var/lib/pgsql/conf.d" - name: POSTGRESQL_MAX_CONNECTIONS displayName: PostgreSQL Max Connections description: PostgreSQL maximum number of database connections allowed. diff --git a/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml b/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml index 5c757b6c2dc..b05e32055fd 100644 --- a/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml +++ b/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml @@ -639,7 +639,7 @@ objects: - name: cfme-pgdb-volume mountPath: "/var/lib/pgsql/data" - name: cfme-pg-configs - mountPath: "${POSTGRESQL_CONFIG_DIR}" + mountPath: "/opt/app-root/src/postgresql-config/" env: - name: POSTGRESQL_USER value: "${DATABASE_USER}" @@ -654,8 +654,6 @@ objects: value: "${POSTGRESQL_MAX_CONNECTIONS}" - name: POSTGRESQL_SHARED_BUFFERS value: "${POSTGRESQL_SHARED_BUFFERS}" - - name: POSTGRESQL_CONFIG_DIR - value: "${POSTGRESQL_CONFIG_DIR}" resources: requests: memory: "${POSTGRESQL_MEM_REQ}" @@ -928,10 +926,6 @@ parameters: displayName: Memcached Slab Page Size description: Memcached size of each slab page. value: 1m -- name: POSTGRESQL_CONFIG_DIR - displayName: PostgreSQL Configuration Overrides - description: Directory used to store PostgreSQL configuration overrides. - value: "/var/lib/pgsql/conf.d" - name: POSTGRESQL_MAX_CONNECTIONS displayName: PostgreSQL Max Connections description: PostgreSQL maximum number of database connections allowed. From 141522f19e5bebd6a50557858715acf4d0ea1600 Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Fri, 16 Feb 2018 10:15:22 -0500 Subject: [PATCH 2/2] Change image location to CF 4.6 GA from Beta --- .../v3.7/cfme-templates/cfme-backup-job.yaml | 2 +- .../v3.7/cfme-templates/cfme-restore-job.yaml | 2 +- .../v3.7/cfme-templates/cfme-template-ext-db.yaml | 10 +++++----- .../examples/v3.7/cfme-templates/cfme-template.yaml | 12 ++++++------ .../v3.9/cfme-templates/cfme-backup-job.yaml | 2 +- .../v3.9/cfme-templates/cfme-restore-job.yaml | 2 +- .../v3.9/cfme-templates/cfme-template-ext-db.yaml | 10 +++++----- .../examples/v3.9/cfme-templates/cfme-template.yaml | 12 ++++++------ .../files/templates/cloudforms/cfme-backup-job.yaml | 2 +- .../files/templates/cloudforms/cfme-restore-job.yaml | 2 +- .../templates/cloudforms/cfme-template-ext-db.yaml | 10 +++++----- .../files/templates/cloudforms/cfme-template.yaml | 12 ++++++------ 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-backup-job.yaml b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-backup-job.yaml index 48d1d4e26b6..5765ed41d18 100644 --- a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-backup-job.yaml +++ b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-backup-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/backup_db" env: diff --git a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-restore-job.yaml b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-restore-job.yaml index 7fd4fc2e1c9..99f7a80ce22 100644 --- a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-restore-job.yaml +++ b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-restore-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/restore_db" env: diff --git a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template-ext-db.yaml b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template-ext-db.yaml index 9866c29c38b..6ccf2a46c05 100644 --- a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template-ext-db.yaml +++ b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template-ext-db.yaml @@ -866,7 +866,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -874,11 +874,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -890,7 +890,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -926,7 +926,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy. diff --git a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml index b05e32055fd..418d4593417 100644 --- a/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml +++ b/roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template.yaml @@ -1024,7 +1024,7 @@ parameters: - name: POSTGRESQL_IMG_NAME displayName: PostgreSQL Image Name description: This is the PostgreSQL image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql + value: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql - name: POSTGRESQL_IMG_TAG displayName: PostgreSQL Image Tag description: This is the PostgreSQL image tag/version requested to deploy. @@ -1032,7 +1032,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -1040,11 +1040,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -1056,7 +1056,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -1097,7 +1097,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy. diff --git a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-backup-job.yaml b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-backup-job.yaml index 48d1d4e26b6..5765ed41d18 100644 --- a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-backup-job.yaml +++ b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-backup-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/backup_db" env: diff --git a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-restore-job.yaml b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-restore-job.yaml index 7fd4fc2e1c9..99f7a80ce22 100644 --- a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-restore-job.yaml +++ b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-restore-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/restore_db" env: diff --git a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template-ext-db.yaml b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template-ext-db.yaml index 9866c29c38b..6ccf2a46c05 100644 --- a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template-ext-db.yaml +++ b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template-ext-db.yaml @@ -866,7 +866,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -874,11 +874,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -890,7 +890,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -926,7 +926,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy. diff --git a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml index b05e32055fd..418d4593417 100644 --- a/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml +++ b/roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml @@ -1024,7 +1024,7 @@ parameters: - name: POSTGRESQL_IMG_NAME displayName: PostgreSQL Image Name description: This is the PostgreSQL image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql + value: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql - name: POSTGRESQL_IMG_TAG displayName: PostgreSQL Image Tag description: This is the PostgreSQL image tag/version requested to deploy. @@ -1032,7 +1032,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -1040,11 +1040,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -1056,7 +1056,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -1097,7 +1097,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy. diff --git a/roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml b/roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml index 48d1d4e26b6..5765ed41d18 100644 --- a/roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml +++ b/roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/backup_db" env: diff --git a/roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml b/roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml index 7fd4fc2e1c9..99f7a80ce22 100644 --- a/roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml +++ b/roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: postgresql - image: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql:latest + image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest command: - "/opt/rh/cfme-container-scripts/restore_db" env: diff --git a/roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml b/roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml index 9866c29c38b..6ccf2a46c05 100644 --- a/roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml +++ b/roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml @@ -866,7 +866,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -874,11 +874,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -890,7 +890,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -926,7 +926,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy. diff --git a/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml b/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml index b05e32055fd..418d4593417 100644 --- a/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml +++ b/roles/openshift_management/files/templates/cloudforms/cfme-template.yaml @@ -1024,7 +1024,7 @@ parameters: - name: POSTGRESQL_IMG_NAME displayName: PostgreSQL Image Name description: This is the PostgreSQL image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-postgresql + value: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql - name: POSTGRESQL_IMG_TAG displayName: PostgreSQL Image Tag description: This is the PostgreSQL image tag/version requested to deploy. @@ -1032,7 +1032,7 @@ parameters: - name: MEMCACHED_IMG_NAME displayName: Memcached Image Name description: This is the Memcached image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-memcached + value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached - name: MEMCACHED_IMG_TAG displayName: Memcached Image Tag description: This is the Memcached image tag/version requested to deploy. @@ -1040,11 +1040,11 @@ parameters: - name: FRONTEND_APPLICATION_IMG_NAME displayName: Frontend Application Image Name description: This is the Frontend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app-ui + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui - name: BACKEND_APPLICATION_IMG_NAME displayName: Backend Application Image Name description: This is the Backend Application image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-app + value: registry.access.redhat.com/cloudforms46/cfme-openshift-app - name: FRONTEND_APPLICATION_IMG_TAG displayName: Front end Application Image Tag description: This is the CloudForms Frontend Application image tag/version requested to deploy. @@ -1056,7 +1056,7 @@ parameters: - name: ANSIBLE_IMG_NAME displayName: Ansible Image Name description: This is the Ansible image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-embedded-ansible + value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible - name: ANSIBLE_IMG_TAG displayName: Ansible Image Tag description: This is the Ansible image tag/version requested to deploy. @@ -1097,7 +1097,7 @@ parameters: - name: HTTPD_IMG_NAME displayName: Apache httpd Image Name description: This is the httpd image name requested to deploy. - value: registry.access.redhat.com/cloudforms46-beta/cfme-openshift-httpd + value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd - name: HTTPD_IMG_TAG displayName: Apache httpd Image Tag description: This is the httpd image tag/version requested to deploy.