diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-28 16:32:38 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 09:05:42 -0500 |
| commit | 7d561bd252a4ddc9e204f31144fbed7fecd99bff (patch) | |
| tree | 372252fd59dfa4e1f576e54977375621858281d0 /roles/openshift_node/tasks/main.yml | |
| parent | 6b25d27ca4ad9458688902d0c3e7c3a9c7b9c15d (diff) | |
| download | openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.gz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.bz2 openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.xz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.zip | |
Correctly set the image tag for containerized installs (and upgrades)
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 43253d72b..27648d109 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -62,12 +62,20 @@ register: install_node_result when: openshift.common.is_containerized | bool +- name: Create the openvswitch service env file + template: + src: openvswitch.sysconfig.j2 + dest: /etc/sysconfig/openvswitch + when: openshift.common.is_containerized | bool + register: install_ovs_sysconfig + - name: Install OpenvSwitch docker service file template: dest: "/etc/systemd/system/openvswitch.service" src: openvswitch.docker.service - register: install_ovs_result when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool + notify: + - restart openvswitch - name: Reload systemd units command: systemctl daemon-reload @@ -101,6 +109,8 @@ line: "OPTIONS=--loglevel={{ openshift.node.debug_level }}" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_node_config_file }}" + - regex: '^IMAGE_VERSION=' + line: "IMAGE_VERSION=v{{ openshift.common.version.split('-')[0] }}" notify: - restart node |