diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
| commit | db711081e6c1b2b676c212b0eeba95da9cb9f2c5 (patch) | |
| tree | f7bb220893b9e76b4d6797e441ed50bf23d51166 /roles/openshift_master | |
| parent | 755a48c4ebf1061ce19892e5378fba769027bfc1 (diff) | |
| parent | fea08b9ba213b69667e103ff9dfd4383218e9eac (diff) | |
| download | openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.gz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.bz2 openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.xz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 0d2fee67e..6b3893570 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -30,7 +30,7 @@ - name: Pull master image command: > - docker pull {{ openshift.master.master_image }}:v{{ openshift_version }} + docker pull {{ openshift.master.master_image }}{{ ':v' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} when: openshift.common.is_containerized | bool - name: Create openshift.common.data_dir |