summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-08 07:42:35 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-08 07:42:35 -0400
commit51e390459d7eda90c44d9ffd7f1199a3590beac1 (patch)
tree61693700c67b16c9465a45ee8e8ad3b2582e4199
parent1b82b1b5980cddae781b31adf02855227ce1ffde (diff)
parent05aabd1cf9129cf0675e64ad10bac3c251842896 (diff)
downloadopenshift-51e390459d7eda90c44d9ffd7f1199a3590beac1.tar.gz
openshift-51e390459d7eda90c44d9ffd7f1199a3590beac1.tar.bz2
openshift-51e390459d7eda90c44d9ffd7f1199a3590beac1.tar.xz
openshift-51e390459d7eda90c44d9ffd7f1199a3590beac1.zip
Merge pull request #1728 from brenton/bz1324729
Bug 1324729 - Import xPaas image streams failed during 3.2 installation
-rw-r--r--roles/openshift_examples/files/examples/v1.1/xpaas-streams/jboss-image-streams.json8
-rw-r--r--roles/openshift_examples/files/examples/v1.2/xpaas-streams/jboss-image-streams.json8
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_examples/files/examples/v1.1/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v1.1/xpaas-streams/jboss-image-streams.json
index 6ad192d9a..5e03d9d48 100644
--- a/roles/openshift_examples/files/examples/v1.1/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v1.1/xpaas-streams/jboss-image-streams.json
@@ -152,8 +152,8 @@
"version": "1.3"
},
"from": {
- "Kind": "DockerImage",
- "Name": "registry.access.redhat.com/jboss-eap-7-beta/eap70-openshift:1.3"
+ "kind": "DockerImage",
+ "name": "registry.access.redhat.com/jboss-eap-7-beta/eap70-openshift:1.3"
}
}
]
@@ -259,8 +259,8 @@
"version": "1.3"
},
"from": {
- "Kind": "DockerImage",
- "Name": "registry.access.redhat.com/redhat-sso-7-tech-preview/sso70-openshift:1.3"
+ "kind": "DockerImage",
+ "name": "registry.access.redhat.com/redhat-sso-7-tech-preview/sso70-openshift:1.3"
}
}
]
diff --git a/roles/openshift_examples/files/examples/v1.2/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v1.2/xpaas-streams/jboss-image-streams.json
index 6ad192d9a..5e03d9d48 100644
--- a/roles/openshift_examples/files/examples/v1.2/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v1.2/xpaas-streams/jboss-image-streams.json
@@ -152,8 +152,8 @@
"version": "1.3"
},
"from": {
- "Kind": "DockerImage",
- "Name": "registry.access.redhat.com/jboss-eap-7-beta/eap70-openshift:1.3"
+ "kind": "DockerImage",
+ "name": "registry.access.redhat.com/jboss-eap-7-beta/eap70-openshift:1.3"
}
}
]
@@ -259,8 +259,8 @@
"version": "1.3"
},
"from": {
- "Kind": "DockerImage",
- "Name": "registry.access.redhat.com/redhat-sso-7-tech-preview/sso70-openshift:1.3"
+ "kind": "DockerImage",
+ "name": "registry.access.redhat.com/redhat-sso-7-tech-preview/sso70-openshift:1.3"
}
}
]