From 0b83281570dc7fb607c728fce37a8a0e9bd9fdea Mon Sep 17 00:00:00 2001
From: Dan Osborne <djosborne10@gmail.com>
Date: Thu, 18 May 2017 17:35:17 -0700
Subject: Fix renaming error with calico template files

---
 roles/calico/templates/10-calico.cfg.j2  |  9 ---------
 roles/calico/templates/10-calico.conf.j2 | 18 ++++++++++++++++++
 roles/calico/templates/calicoctl.cfg.j2  |  9 +++++++++
 roles/calico/templates/calicoctl.conf.j2 | 18 ------------------
 4 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 roles/calico/templates/10-calico.cfg.j2
 create mode 100644 roles/calico/templates/10-calico.conf.j2
 create mode 100644 roles/calico/templates/calicoctl.cfg.j2
 delete mode 100644 roles/calico/templates/calicoctl.conf.j2

(limited to 'roles/calico')

diff --git a/roles/calico/templates/10-calico.cfg.j2 b/roles/calico/templates/10-calico.cfg.j2
deleted file mode 100644
index 722385ed8..000000000
--- a/roles/calico/templates/10-calico.cfg.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: calicoApiConfig
-metadata:
-spec:
-  datastoreType: "etcdv2"
-  etcdEndpoints: "{{ etcd_endpoints }}"
-  etcdKeyFile: "{{ calico_etcd_key_file }}"
-  etcdCertFile: "{{ calico_etcd_cert_file }}"
-  etcdCaCertFile: "{{ calico_etcd_ca_cert_file }}"
diff --git a/roles/calico/templates/10-calico.conf.j2 b/roles/calico/templates/10-calico.conf.j2
new file mode 100644
index 000000000..3c8c6b046
--- /dev/null
+++ b/roles/calico/templates/10-calico.conf.j2
@@ -0,0 +1,18 @@
+{
+  "name": "calico",
+  "type": "calico",
+  "ipam": {
+    "type": "calico-ipam"
+  },
+  "etcd_endpoints": "{{ etcd_endpoints }}",
+  "etcd_key_file": "{{ calico_etcd_key_file }}",
+  "etcd_cert_file": "{{ calico_etcd_cert_file }}",
+  "etcd_ca_cert_file": "{{ calico_etcd_ca_cert_file }}",
+  "kubernetes": {
+    "kubeconfig": "{{ kubeconfig }}"
+  },
+  "hostname": "{{ openshift.common.hostname }}",
+  "policy": {
+    "type": "k8s"
+  }
+}
diff --git a/roles/calico/templates/calicoctl.cfg.j2 b/roles/calico/templates/calicoctl.cfg.j2
new file mode 100644
index 000000000..722385ed8
--- /dev/null
+++ b/roles/calico/templates/calicoctl.cfg.j2
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: calicoApiConfig
+metadata:
+spec:
+  datastoreType: "etcdv2"
+  etcdEndpoints: "{{ etcd_endpoints }}"
+  etcdKeyFile: "{{ calico_etcd_key_file }}"
+  etcdCertFile: "{{ calico_etcd_cert_file }}"
+  etcdCaCertFile: "{{ calico_etcd_ca_cert_file }}"
diff --git a/roles/calico/templates/calicoctl.conf.j2 b/roles/calico/templates/calicoctl.conf.j2
deleted file mode 100644
index 3c8c6b046..000000000
--- a/roles/calico/templates/calicoctl.conf.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "calico",
-  "type": "calico",
-  "ipam": {
-    "type": "calico-ipam"
-  },
-  "etcd_endpoints": "{{ etcd_endpoints }}",
-  "etcd_key_file": "{{ calico_etcd_key_file }}",
-  "etcd_cert_file": "{{ calico_etcd_cert_file }}",
-  "etcd_ca_cert_file": "{{ calico_etcd_ca_cert_file }}",
-  "kubernetes": {
-    "kubeconfig": "{{ kubeconfig }}"
-  },
-  "hostname": "{{ openshift.common.hostname }}",
-  "policy": {
-    "type": "k8s"
-  }
-}
-- 
cgit v1.2.1