summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-25 09:20:15 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:29:18 -0300
commit717012aa4d5df01e5859ce44705abfbf34be8047 (patch)
tree19bb9ebbd4b0045bac07fdd60cf37a99693bf1bf /roles/openshift_node/tasks
parent5c833d9f29e292d11c0cbf08786e9015f133ce17 (diff)
downloadopenshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.gz
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.bz2
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.xz
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.zip
Hookup node configuration.
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml5
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml2
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e8bd13855..ec4252fed 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -1,4 +1,5 @@
---
+- debug: var=openshift_version
# TODO: allow for overriding default ports where possible
- fail:
msg: "SELinux is disabled, This deployment type requires that SELinux is enabled."
@@ -39,12 +40,12 @@
- name: Pull node image
command: >
- docker pull {{ openshift.node.node_image }}:{{ openshift_version }}
+ docker pull {{ openshift.node.node_image }}:v{{ openshift_version }}
when: openshift.common.is_containerized | bool
- name: Pull OpenVSwitch image
command: >
- docker pull {{ openshift.node.ovs_image }}:{{ openshift_version }}
+ docker pull {{ openshift.node.ovs_image }}:v{{ openshift_version }}
when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool
- name: Install the systemd units
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index e2a268260..0117a5a02 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -44,6 +44,6 @@
- regex: '^CONFIG_FILE='
line: "CONFIG_FILE={{ openshift_node_config_file }}"
- regex: '^IMAGE_VERSION='
- line: "IMAGE_VERSION={{ openshift_version }}"
+ line: "IMAGE_VERSION=v{{ openshift_version }}"
notify:
- restart node