...
 
Commits (11)
......@@ -9,7 +9,7 @@
%global __requires_exclude ^/usr/bin/ansible-playbook$
Name: openshift-ansible
Version: 3.11.116
Version: 3.11.117
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
......@@ -190,6 +190,12 @@ BuildArch: noarch
%{_datadir}/ansible/%{name}/test
%changelog
* Sun Jun 09 2019 AOS Automation Release Team <aos-team-art@redhat.com> 3.11.117-1
- [3.11]: allow cluster autoscaler to evict pods (jchaloup@redhat.com)
- Add EAP CD 16 imagestreams & templates (ken@zaptillion.net)
- Clean up Ansible Service Broker Configmap (rteague@redhat.com)
- Bug 1585070: remove cpu_manager_state file (rphillips@redhat.com)
* Wed Jun 05 2019 AOS Automation Release Team <aos-team-art@redhat.com> 3.11.116-1
- Correct data type of "openshift_master_audit_config" parameters
(bysnupy@hotmail.com)
......
......@@ -760,6 +760,23 @@ openshift_kuryr_subnet_driver: namespace
openshift_kuryr_sg_driver: namespace
```
When namespace isolation is enabled there is a new subnet per namespace being
created. If port pooling is enabled, in order to pre-populate the newly created
namespaces, i.e., to have pools ready for the pods on that namespace, the
kuryrnet handler needs to be enabled on the kuryr-config configmap after the
installation is completed:
```
$ oc -n KURYR_NAMESPACE edit cm kuryr-config
...
[kubernetes]
enabled_handlers = vif,lb,lbaasspec,namespace,*kuryrnet*
...
```
Note depending on the Kuryr controller image version, this feature (handler)
may not be available.
### Network Policies
......
......@@ -11,17 +11,17 @@ data:
registry:
- type: {{ ansible_service_broker_registry_type }}
name: {{ ansible_service_broker_registry_name }}
url: {{ ansible_service_broker_registry_url }}
org: {{ ansible_service_broker_registry_organization }}
tag: {{ ansible_service_broker_registry_tag }}
white_list: {{ ansible_service_broker_registry_whitelist | to_yaml }}
black_list: {{ ansible_service_broker_registry_blacklist | to_yaml }}
auth_type: "{{ ansible_service_broker_registry_auth_type | default("") }}"
auth_name: "{{ ansible_service_broker_registry_auth_name | default("") }}"
url: {{ ansible_service_broker_registry_url }}
org: {{ ansible_service_broker_registry_organization }}
tag: {{ ansible_service_broker_registry_tag }}
white_list: {{ ansible_service_broker_registry_whitelist }}
black_list: {{ ansible_service_broker_registry_blacklist }}
auth_type: {{ ansible_service_broker_registry_auth_type | default('') }}
auth_name: {{ ansible_service_broker_registry_auth_name | default('') }}
- type: local_openshift
name: localregistry
white_list: {{ ansible_service_broker_local_registry_whitelist | to_yaml }}
namespaces: {{ ansible_service_broker_local_registry_namespaces | to_yaml }}
white_list: {{ ansible_service_broker_local_registry_whitelist }}
namespaces: {{ ansible_service_broker_local_registry_namespaces }}
dao:
type: crd
log:
......@@ -29,9 +29,9 @@ data:
level: {{ ansible_service_broker_log_level }}
color: true
openshift:
host: ""
ca_file: ""
bearer_token_file: ""
host: ''
ca_file: ''
bearer_token_file: ''
namespace: openshift-ansible-service-broker
sandbox_role: {{ ansible_service_broker_sandbox_role }}
image_pull_policy: {{ ansible_service_broker_image_pull_policy }}
......
......@@ -239,7 +239,7 @@ data:
{% if openshift_kuryr_sg_driver|default('default') == 'policy' %}
enabled_handlers = vif,lb,lbaasspec,namespace,policy,pod_label,kuryrnetpolicy,kuryrnet
{% else %}
enabled_handlers = vif,lb,lbaasspec,namespace,kuryrnet
enabled_handlers = vif,lb,lbaasspec,namespace
{% endif %}
{% else %}
enabled_handlers = vif,lb,lbaasspec
......
......@@ -60,3 +60,11 @@ rules:
- list
- watch
attributeRestrictions: null
- apiGroups:
- ""
resources:
- "pods/eviction"
verbs:
- "create"
attributeRestrictions: null
......@@ -17,11 +17,11 @@
"annotations": {
"openshift.io/display-name": "JBoss EAP continuous delivery",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"version": "15.0"
"version": "16.0"
}
},
"labels": {
"xpaas": "15.0"
"xpaas": "16.0"
},
"spec": {
"tags": [
......@@ -46,6 +46,28 @@
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:latest"
}
},
{
"name": "16",
"annotations": {
"description": "JBoss EAP continuous delivery Tech Preview version 16.",
"iconClass": "icon-eap",
"tags": "builder,eap,javaee,java,jboss,hidden",
"supports": "eap:7.3,javaee:8,java:8",
"sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
"sampleContextDir": "kitchensink",
"sampleRef": "openshift",
"version": "16",
"openshift.io/display-name": "JBoss EAP continuous delivery 16 (Tech Preview)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "ImageStreamTag",
"name": "16.0"
}
},
{
"name": "15",
"annotations": {
......@@ -217,8 +239,28 @@
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:15.0"
}
},
{
"name": "16.0",
"annotations": {
"description": "JBoss EAP continuous delivery 16 Tech Preview S2I Image",
"iconClass": "icon-eap",
"tags": "builder,eap,javaee,java,jboss,hidden",
"supports": "eap:7.3,javaee:8,java:8",
"sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
"sampleContextDir": "kitchensink",
"sampleRef": "openshift",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP continuous delivery 16 (Tech Preview)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:16.0"
}
}
]
}
}
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "14.0",
"openshift.io/display-name": "JBoss EAP CD 14 + AMQ 7 with passthrough TLS",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + AMQ 7 with passthrough TLS",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application using Red Hat JBoss AMQ with persistence and secure communication using https. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ with persistence and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-amq-persistent-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and AMQ persistent based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -489,7 +489,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -665,7 +665,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + AMQ 7 with passthrough TLS",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + AMQ 7 with passthrough TLS",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application using Red Hat JBoss AMQ. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-amq-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and AMQ 7 based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -475,7 +475,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -655,7 +655,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and secure communication using edge TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-basic-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD based application has been created in your project.",
"parameters": [
......@@ -261,7 +261,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -388,7 +388,7 @@
"env": [
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 with passthrough TLS",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 with passthrough TLS",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application configured with secure communication using HTTPS. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery application, including a build configuration, application deployment configuration and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-https-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD based application with SSL support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -374,7 +374,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -518,7 +518,7 @@
"env": [
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + MongoDB with passthrough TLS",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + MongoDB with passthrough TLS",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MongoDB database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-mongodb-persistent-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and MongoDB persistent based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -488,7 +488,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -668,7 +668,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + MongoDB (Ephemeral, with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + MongoDB (Ephemeral, with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MongoDB database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-mongodb-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new EAP CD and MongoDB based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -481,7 +481,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -661,7 +661,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + MySQL with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + MySQL with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MySQL database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-mysql-persistent-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new EAP CD and MySQL persistent based application with SSL support has been created in your project. The username/password for accessing the MySQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -492,7 +492,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -672,7 +672,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + MySQL (Ephemeral, with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + MySQL (Ephemeral, with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MySQL database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using ephemeral (temporary) storage and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-mysql-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new EAP CD and MySQL based application with SSL support has been created in your project. The username/password for accessing the MySQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -485,7 +485,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -665,7 +665,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + PostgreSQL (Persistent, with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + PostgreSQL (Persistent, with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a persistent PostgreSQL database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-postgresql-persistent-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and PostgreSQL persistent based application with SSL support has been created in your project. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -474,7 +474,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -654,7 +654,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + PostgreSQL (Ephemeral, with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + PostgreSQL (Ephemeral, with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with an PostgreSQL database configured with secure communication using https and ephemeral storage. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-postgresql-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and PostgreSQL based application with SSL support has been created in your project. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -467,7 +467,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -647,7 +647,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + Single Sign-On with passthrough TLS",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + Single Sign-On with passthrough TLS",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application Single Sign-On application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, integrated with Red Hat Single Sign-On and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-sso-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD based application with SSL and SSO support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -202,7 +202,7 @@
},
{
"displayName": "SSO Username",
"description": "The username used to access the SSO service. This is used to create the application client(s) within the specified SSO realm. This should match the SSO_SERVICE_USERNAME specified through one of the sso70-* templates.",
"description": "The username used to access the SSO service. This is used to create the appliction client(s) within the specified SSO realm. This should match the SSO_SERVICE_USERNAME specified through one of the sso70-* templates.",
"name": "SSO_USERNAME",
"value": "",
"required": false
......@@ -503,7 +503,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
},
"env": [
{
......@@ -675,7 +675,7 @@
"env": [
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 Starter",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 Starter",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and secure communication using edge TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-starter-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD based application has been created in your project.",
"parameters": [
......@@ -204,7 +204,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 (with passthrough TLS, DB drivers)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 (with passthrough TLS, DB drivers)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-third-party-db-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new EAP 7 based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s); \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -421,7 +421,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -580,7 +580,7 @@
"env": [
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 (tx recovery) + PostgreSQL (Ephemeral with passthrough TLS)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 (tx recovery) + PostgreSQL (Ephemeral with passthrough TLS)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with an PostgreSQL database configured with secure communication using passthrough TLS and ephemeral storage with transaction recovery enabled. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage and secure communication using passthrough TLS. The difference from the simple PosgreSQL template is that the transaction recovery is switched on here. The recovery marker data is saved to the PostgreSQL database.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-tx-recovery-postgresql-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD and PostgreSQL based application with SSL support has been created in your project. Transaction recovery is enabled for storing recovery data in the PostgreSQL database. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
"parameters": [
......@@ -478,10 +478,11 @@
}
],
"forcePull": true,
"incremental": true,
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -670,7 +671,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......@@ -896,7 +897,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -5,8 +5,8 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
"version": "15.0",
"openshift.io/display-name": "JBoss EAP CD 15 + AMQ 7 (tx recovery)",
"version": "16.0",
"openshift.io/display-name": "JBoss EAP CD 16 + AMQ 7 (tx recovery)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application with transaction recovery configured. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and insecure communication using http. The template also demonstrates how to enable automated transaction recovery on scale down of application pods. Automated transaction recovery is currently Technology Preview.",
......@@ -17,7 +17,7 @@
},
"labels": {
"template": "eap-cd-tx-recovery-s2i",
"xpaas": "15.0"
"xpaas": "16.0"
},
"message": "A new JBoss EAP CD based application has been created in your project.",
"parameters": [
......@@ -423,7 +423,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:15"
"name": "eap-cd-openshift:16"
}
}
},
......@@ -589,7 +589,7 @@
},
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......@@ -898,7 +898,7 @@
"env": [
{
"name": "JGROUPS_PING_PROTOCOL",
"value": "openshift.DNS_PING"
"value": "dns.DNS_PING"
},
{
"name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
......
......@@ -38,3 +38,9 @@
line: pause_image = "{{ openshift_crio_pause_image }}"
regexp: '^pause_image ='
when: crio_conf.stat.exists == True
# BZ1585070
- name: Clean cpu_manager_state module
file:
state: absent
path: "{{ openshift_node_data_dir }}/openshift.local.volumes/cpu_manager_state"