Merge pull request #1311 from sdodson/is-sync

Sync latest imagestreams

5 files changed, 123 insertions, 109 deletions

diff --git a/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-ephemeral-template.json
index 11767862d..68438b538 100644
--- a/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-ephemeral-template.json
@@ -87,6 +87,13 @@
               {
                 "name": "mongodb",
                 "image": "mongodb",
+                "readinessProbe": {
+                    "tcpSocket":{
+                        "port": 27017
+                    },
+                    "initialDelaySeconds": 15,
+                    "timeoutSeconds": 1
+                },
                 "ports": [
                   {
                     "containerPort": 27017,
diff --git a/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-persistent-template.json b/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-persistent-template.json
index 97b315600..e90ed6fa8 100644
--- a/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-persistent-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/db-templates/mongodb-persistent-template.json
@@ -104,6 +104,13 @@
               {
                 "name": "mongodb",
                 "image": "mongodb",
+                "readinessProbe": {
+                    "tcpSocket":{
+                        "port": 27017
+                    },
+                    "initialDelaySeconds": 15,
+                    "timeoutSeconds": 1
+                },
                 "ports": [
                   {
                     "containerPort": 27017,
diff --git a/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-centos7.json b/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-centos7.json
index 51805d729..a327c0215 100644
--- a/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-centos7.json
+++ b/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-centos7.json
@@ -15,8 +15,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.2"
+              "kind": "ImageStreamTag",
+              "name": "2.2"
             }
           },
           {
@@ -30,8 +30,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/ruby-20-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/ruby-20-centos7:latest"
             }
           },
           {
@@ -45,8 +45,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/ruby-22-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/ruby-22-centos7:latest"
             }
           }
         ]
@@ -64,8 +64,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "0.10"
+              "kind": "ImageStreamTag",
+              "name": "0.10"
             }
           },
           {
@@ -79,8 +79,8 @@
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/nodejs-010-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/nodejs-010-centos7:latest"
             }
           }
         ]
@@ -98,8 +98,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.20"
+              "kind": "ImageStreamTag",
+              "name": "5.20"
             }
           },
           {
@@ -113,8 +113,8 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/perl-516-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/perl-516-centos7:latest"
             }
           },
           {
@@ -128,8 +128,8 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/perl-520-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/perl-520-centos7:latest"
             }
 
           }
@@ -148,8 +148,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.6"
+              "kind": "ImageStreamTag",
+              "name": "5.6"
             }
           },
           {
@@ -163,8 +163,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/php-55-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/php-55-centos7:latest"
             }
           },
           {
@@ -178,8 +178,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/php-56-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/php-56-centos7:latest"
             }
           }
         ]
@@ -197,8 +197,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "3.4"
+              "kind": "ImageStreamTag",
+              "name": "3.4"
             }
           },
           {
@@ -212,8 +212,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/python-33-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/python-33-centos7:latest"
             }
           },
           {
@@ -227,8 +227,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/python-27-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/python-27-centos7:latest"
             }
           },
           {
@@ -242,8 +242,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/python-34-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/python-34-centos7:latest"
             }
           }
         ]
@@ -261,8 +261,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "8.1"
+              "kind": "ImageStreamTag",
+              "name": "8.1"
             }
           },
           {
@@ -276,8 +276,8 @@
               "sampleRepo": "https://github.com/bparees/openshift-jee-sample.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/wildfly-81-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/wildfly-81-centos7:latest"
             }
           }
         ]
@@ -295,22 +295,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.6"
+              "kind": "ImageStreamTag",
+              "name": "5.6"
             }
           },
           {
             "name": "5.5",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/mysql-55-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/mysql-55-centos7:latest"
             }
           },
           {
             "name": "5.6",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/mysql-56-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/mysql-56-centos7:latest"
             }
           }
         ]
@@ -328,22 +328,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "9.4"
+              "kind": "ImageStreamTag",
+              "name": "9.4"
             }
           },
           {
             "name": "9.2",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/postgresql-92-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/postgresql-92-centos7:latest"
             }
           },
           {
             "name": "9.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/postgresql-94-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/postgresql-94-centos7:latest"
             }
           }
         ]
@@ -361,22 +361,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.6"
+              "kind": "ImageStreamTag",
+              "name": "2.6"
             }
           },
           {
             "name": "2.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/mongodb-24-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/mongodb-24-centos7:latest"
             }
           },
           {
             "name": "2.6",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/mongodb-26-centos7:latest"
+              "kind": "DockerImage",
+              "name": "centos/mongodb-26-centos7:latest"
             }
           }
         ]
@@ -394,15 +394,15 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "1"
+              "kind": "ImageStreamTag",
+              "name": "1"
             }
           },
           {
             "name": "1",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/jenkins-1-centos7:latest"
+              "kind": "DockerImage",
+              "name": "openshift/jenkins-1-centos7:latest"
             }
           }
         ]
diff --git a/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-rhel7.json b/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-rhel7.json
index 3092ee486..3f5f713b4 100644
--- a/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-rhel7.json
+++ b/roles/openshift_examples/files/examples/v1.1/image-streams/image-streams-rhel7.json
@@ -15,8 +15,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.2"
+              "kind": "ImageStreamTag",
+              "name": "2.2"
             }
           },
           {
@@ -30,8 +30,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/ruby-20-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/ruby-20-rhel7:latest"
             }
           },
           {
@@ -45,8 +45,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
             }
           }
         ]
@@ -64,8 +64,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "0.10"
+              "kind": "ImageStreamTag",
+              "name": "0.10"
             }
           },
           {
@@ -79,8 +79,8 @@
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/nodejs-010-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/nodejs-010-rhel7:latest"
             }
           }
         ]
@@ -98,8 +98,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.20"
+              "kind": "ImageStreamTag",
+              "name": "5.20"
             }
           },
           {
@@ -113,8 +113,8 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/perl-516-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/perl-516-rhel7:latest"
             }
           },
           {
@@ -128,8 +128,8 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/perl-520-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/perl-520-rhel7:latest"
             }
 
           }
@@ -148,8 +148,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.6"
+              "kind": "ImageStreamTag",
+              "name": "5.6"
             }
           },
           {
@@ -163,8 +163,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"              
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/php-55-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/php-55-rhel7:latest"
             }
           },
           {
@@ -178,8 +178,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/php-56-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/php-56-rhel7:latest"
             }
           }
         ]
@@ -197,8 +197,8 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "3.4"
+              "kind": "ImageStreamTag",
+              "name": "3.4"
             }
           },
           {
@@ -212,8 +212,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/python-33-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/python-33-rhel7:latest"
             }
           },
           {
@@ -227,8 +227,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/python-27-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/python-27-rhel7:latest"
             }
           },
           {
@@ -242,8 +242,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/python-34-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/python-34-rhel7:latest"
             }
           }
         ]
@@ -261,22 +261,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.6"
+              "kind": "ImageStreamTag",
+              "name": "5.6"
             }
           },
           {
             "name": "5.5",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/mysql-55-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/mysql-55-rhel7:latest"
             }
           },
           {
             "name": "5.6",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/mysql-56-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/mysql-56-rhel7:latest"
             }
           }
         ]
@@ -294,22 +294,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "9.4"
+              "kind": "ImageStreamTag",
+              "name": "9.4"
             }
           },
           {
             "name": "9.2",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/postgresql-92-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/postgresql-92-rhel7:latest"
             }
           },
           {
             "name": "9.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/postgresql-94-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/postgresql-94-rhel7:latest"
             }
           }
         ]
@@ -327,22 +327,22 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.6"
+              "kind": "ImageStreamTag",
+              "name": "2.6"
             }
           },
           {
             "name": "2.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/mongodb-24-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/mongodb-24-rhel7:latest"
             }
           },
           {
             "name": "2.6",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/mongodb-26-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/rhscl/mongodb-26-rhel7:latest"
             }
           }
         ]
@@ -360,15 +360,15 @@
           {
             "name": "latest",
             "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "1"
+              "kind": "ImageStreamTag",
+              "name": "1"
             }
           },
           {
             "name": "1",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/jenkins-1-rhel7:latest"
+              "kind": "DockerImage",
+              "name": "registry.access.redhat.com/openshift3/jenkins-1-rhel7:latest"
             }
           }
         ]
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml
index 9a5eebc66..a5731be09 100644
--- a/roles/openshift_examples/tasks/main.yml
+++ b/roles/openshift_examples/tasks/main.yml
@@ -8,7 +8,7 @@
 - name: Import RHEL streams
   command: >
     {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ rhel_image_streams }}
-  when: openshift_examples_load_rhel
+  when: openshift_examples_load_rhel | bool
   register: oex_import_rhel_streams
   failed_when: "'already exists' not in oex_import_rhel_streams.stderr and oex_import_rhel_streams.rc != 0"
   changed_when: false