diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-04 16:39:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 16:39:04 -0500 |
| commit | 5a7b6beed127607f75a6c1128152da89ce01eca7 (patch) | |
| tree | 122851390956763876b9028ff976cd225c9f5264 /roles/contiv | |
| parent | 411235245c903be9e12790444f2f4cfae5ca7ef0 (diff) | |
| parent | 5120f8e90c0178ac7f6d911159ceb278dd87b4c9 (diff) | |
| download | openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.gz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.bz2 openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.xz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.zip | |
Merge pull request #6297 from mgugino-upstream-stage/crt_role
Implement container runtime role
Diffstat (limited to 'roles/contiv')
| -rw-r--r-- | roles/contiv/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/contiv/tasks/netplugin.yml | 2 | ||||
| -rw-r--r-- | roles/contiv/templates/aci-gw.service | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/roles/contiv/defaults/main.yml b/roles/contiv/defaults/main.yml index b5d2f7c6e..aa976d921 100644 --- a/roles/contiv/defaults/main.yml +++ b/roles/contiv/defaults/main.yml @@ -119,3 +119,5 @@ contiv_h1_gw_default: "10.129.0.1" # contiv default private subnet for ext access contiv_private_ext_subnet: "10.130.0.0/16" + +openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False)) else 'docker' }}" diff --git a/roles/contiv/tasks/netplugin.yml b/roles/contiv/tasks/netplugin.yml index 0b2f91bab..cf92a8cc0 100644 --- a/roles/contiv/tasks/netplugin.yml +++ b/roles/contiv/tasks/netplugin.yml @@ -105,7 +105,7 @@ - name: Docker | Restart docker service: - name: "{{ openshift.docker.service_name }}" + name: "{{ openshift_docker_service_name }}" state: restarted when: docker_updated|changed register: l_docker_restart_docker_in_contiv_result diff --git a/roles/contiv/templates/aci-gw.service b/roles/contiv/templates/aci-gw.service index 4506d2231..90bb98001 100644 --- a/roles/contiv/templates/aci-gw.service +++ b/roles/contiv/templates/aci-gw.service @@ -1,6 +1,6 @@ [Unit] Description=Contiv ACI gw -After=auditd.service systemd-user-sessions.service time-sync.target {{ openshift.docker.service_name }}.service +After=auditd.service systemd-user-sessions.service time-sync.target {{ openshift_docker_service_name }}.service [Service] ExecStart={{ bin_dir }}/aci_gw.sh start |