Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to CloudForms 4.6.2 templates #8297

Merged
merged 2 commits into from May 9, 2018
Merged

Update to CloudForms 4.6.2 templates #8297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf98787
Update to CloudForms 4.6.2 templates
simaishi May 8, 2018
bdd473d
Update cloudforms templates to be in sync with
simaishi May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-backup-job.yaml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-restore-job.yaml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
30 changes: 24 additions & 6 deletions roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-template-ext-db.yaml
View file
Open in desktop
Expand Up @@ -25,6 +25,24 @@ objects:
kind: ServiceAccount
metadata:
name: cfme-httpd
- apiVersion: v1
kind: RoleBinding
metadata:
name: view
roleRef:
name: view
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: RoleBinding
metadata:
name: edit
roleRef:
name: edit
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -457,7 +475,7 @@ objects:
RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
ProxyPassReverse / http://${NAME}/

# Ensures httpd stdout/stderr are seen by docker logs.
# Ensures httpd stdout/stderr are seen by 'docker logs'.
ErrorLog "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
</VirtualHost>
Expand Down Expand Up @@ -866,19 +884,19 @@ 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.
value: latest
- 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.
Expand All @@ -890,7 +908,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.
Expand Down Expand Up @@ -926,7 +944,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.
Expand Down
40 changes: 26 additions & 14 deletions roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-template.yaml
View file
Open in desktop
Expand Up @@ -25,6 +25,24 @@ objects:
kind: ServiceAccount
metadata:
name: cfme-httpd
- apiVersion: v1
kind: RoleBinding
metadata:
name: view
roleRef:
name: view
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: RoleBinding
metadata:
name: edit
roleRef:
name: edit
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -147,7 +165,7 @@ objects:
RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
ProxyPassReverse / http://${NAME}/

# Ensures httpd stdout/stderr are seen by docker logs.
# Ensures httpd stdout/stderr are seen by 'docker logs'.
ErrorLog "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
</VirtualHost>
Expand Down Expand Up @@ -639,7 +657,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-cfg/"
env:
- name: POSTGRESQL_USER
value: "${DATABASE_USER}"
Expand All @@ -654,8 +672,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}"
Expand Down Expand Up @@ -928,10 +944,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.
Expand Down Expand Up @@ -1030,27 +1042,27 @@ 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.
value: latest
- 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.
value: latest
- 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.
Expand All @@ -1062,7 +1074,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.
Expand Down Expand Up @@ -1103,7 +1115,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.
Expand Down
20 changes: 19 additions & 1 deletion roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml
View file
Open in desktop
Expand Up @@ -25,6 +25,24 @@ objects:
kind: ServiceAccount
metadata:
name: cfme-httpd
- apiVersion: v1
kind: RoleBinding
metadata:
name: view
roleRef:
name: view
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: RoleBinding
metadata:
name: edit
roleRef:
name: edit
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -457,7 +475,7 @@ objects:
RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
ProxyPassReverse / http://${NAME}/

# Ensures httpd stdout/stderr are seen by docker logs.
# Ensures httpd stdout/stderr are seen by 'docker logs'.
ErrorLog "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
</VirtualHost>
Expand Down
22 changes: 20 additions & 2 deletions roles/openshift_management/files/templates/cloudforms/cfme-template.yaml
View file
Open in desktop
Expand Up @@ -25,6 +25,24 @@ objects:
kind: ServiceAccount
metadata:
name: cfme-httpd
- apiVersion: v1
kind: RoleBinding
metadata:
name: view
roleRef:
name: view
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: RoleBinding
metadata:
name: edit
roleRef:
name: edit
subjects:
- kind: ServiceAccount
name: cfme-orchestrator
- apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -147,7 +165,7 @@ objects:
RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
ProxyPassReverse / http://${NAME}/

# Ensures httpd stdout/stderr are seen by docker logs.
# Ensures httpd stdout/stderr are seen by 'docker logs'.
ErrorLog "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
</VirtualHost>
Expand Down Expand Up @@ -639,7 +657,7 @@ objects:
- name: cfme-pgdb-volume
mountPath: "/var/lib/pgsql/data"
- name: cfme-pg-configs
mountPath: "/opt/app-root/src/postgresql-config/"
mountPath: "/opt/app-root/src/postgresql-cfg/"
env:
- name: POSTGRESQL_USER
value: "${DATABASE_USER}"
Expand Down