diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-24 11:56:11 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-25 10:28:33 -0300 |
| commit | 5c833d9f29e292d11c0cbf08786e9015f133ce17 (patch) | |
| tree | dccfbd5103a2bf8d77a3e7ea4c2850488a03e6b9 /roles | |
| parent | 436c287335c3b578aaa2c1c8835583feaee2a3cf (diff) | |
| download | openshift-5c833d9f29e292d11c0cbf08786e9015f133ce17.tar.gz openshift-5c833d9f29e292d11c0cbf08786e9015f133ce17.tar.bz2 openshift-5c833d9f29e292d11c0cbf08786e9015f133ce17.tar.xz openshift-5c833d9f29e292d11c0cbf08786e9015f133ce17.zip | |
Complete installation of first master containerized.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 6870def5f..86942f055 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -2,7 +2,6 @@ # TODO: add ability to configure certificates given either a local file to # point to or certificate contents, set in default cert locations. - debug: var=openshift_version -- fail: # Authentication Variable Validation # TODO: validate the different identity provider kinds as well @@ -31,7 +30,7 @@ - name: Pull master image command: > - docker pull {{ openshift.master.master_image }}:{{ openshift_version }} + docker pull {{ openshift.master.master_image }}:v{{ openshift_version }} when: openshift.common.is_containerized | bool - name: Create openshift.common.data_dir diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 026787421..ba2974476 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -1,7 +1,7 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized | bool %} -IMAGE_VERSION={{ openshift_version }} +IMAGE_VERSION=v{{ openshift_version }} {% endif %} {% if 'cloudprovider' in openshift and 'aws' in openshift.cloudprovider and 'kind' in openshift.cloudprovider and openshift.cloudprovider.kind == 'aws' and 'access_key' in openshift.cloudprovider.aws and 'secret_key' in openshift.cloudprovider.aws %} |