diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-18 11:14:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 11:14:34 -0500 |
| commit | 836147ba7f8f684f56c6b9e732c3778f1d0dab73 (patch) | |
| tree | 4ff71c5785f5ea71c09362a7c038af0e2119c944 /roles/calico/templates | |
| parent | bf317d610b5a201c845fe337c88f2114a56ab1ad (diff) | |
| parent | 6c85255ad4ec8ed25af2c9bdd717ce43e68e134c (diff) | |
| download | openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.gz openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.bz2 openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.xz openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.zip | |
Merge pull request #4142 from VincentS/Adjustment_Naming_Schema
Merged by openshift-bot
Diffstat (limited to 'roles/calico/templates')
| -rw-r--r-- | roles/calico/templates/10-calico.cfg.j2 (renamed from roles/calico/templates/calico.cfg.j2) | 0 | ||||
| -rw-r--r-- | roles/calico/templates/calicoctl.conf.j2 (renamed from roles/calico/templates/calico.conf.j2) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/roles/calico/templates/calico.cfg.j2 b/roles/calico/templates/10-calico.cfg.j2 index 722385ed8..722385ed8 100644 --- a/roles/calico/templates/calico.cfg.j2 +++ b/roles/calico/templates/10-calico.cfg.j2 diff --git a/roles/calico/templates/calico.conf.j2 b/roles/calico/templates/calicoctl.conf.j2 index 3c8c6b046..3c8c6b046 100644 --- a/roles/calico/templates/calico.conf.j2 +++ b/roles/calico/templates/calicoctl.conf.j2 |