[CORD-2361]
Fix E-CORD podconfigs to avoid persisting `pki_dir` and similar
Change-Id: I0bcb52fe3c0a7a8351da05b878391a5780d5022d
diff --git a/onlab-ecord-global.yml b/onlab-ecord-global.yml
index a351bf5..5bc0507 100644
--- a/onlab-ecord-global.yml
+++ b/onlab-ecord-global.yml
@@ -18,12 +18,6 @@
cord_profile: ecord-global
# Variables
-# shared between podconfigs, for root/intermediate CA setup
-pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_pki' ) | realpath }}"
-
-# different, as passwords/SSH keys/cord_profile should be different
-credentials_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_global_credentials' ) | realpath }}"
-ssh_pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_global_ssh_pki' ) | realpath }}"
config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_global_profile' ) | realpath }}"
start_xos_prereqs:
diff --git a/onlab-ecord-local-pod1.yml b/onlab-ecord-local-pod1.yml
index 506bc52..6a12d97 100644
--- a/onlab-ecord-local-pod1.yml
+++ b/onlab-ecord-local-pod1.yml
@@ -18,12 +18,6 @@
cord_profile: ecord
# Variables
-# FIXME: should be shared between podconfigs, for root/intermediate CA setup
-pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod1_pki' ) | realpath }}"
-
-# different, as passwords/SSH keys/cord_profile should be different
-credentials_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod1_credentials' ) | realpath }}"
-ssh_pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod1_ssh_pki' ) | realpath }}"
config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod1_profile' ) | realpath }}"
# path created on local system, mounted into corddev by Vagrant
diff --git a/onlab-ecord-local-pod2.yml b/onlab-ecord-local-pod2.yml
index b69e0d7..4357433 100644
--- a/onlab-ecord-local-pod2.yml
+++ b/onlab-ecord-local-pod2.yml
@@ -18,13 +18,6 @@
cord_profile: ecord
# Variables
-# shared between podconfigs, for root/intermediate CA setup
-#pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_pki' ) | realpath }}"
-pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod2_pki' ) | realpath }}"
-
-# different, as passwords/SSH keys/cord_profile should be different
-credentials_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod2_credentials' ) | realpath }}"
-ssh_pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod2_ssh_pki' ) | realpath }}"
config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod2_profile' ) | realpath }}"
# path created on local system, mounted into corddev by Vagrant
diff --git a/onlab-ecord-local-pod3.yml b/onlab-ecord-local-pod3.yml
index c7c73f9..4c6ed07 100644
--- a/onlab-ecord-local-pod3.yml
+++ b/onlab-ecord-local-pod3.yml
@@ -18,13 +18,6 @@
cord_profile: ecord
# Variables
-# shared between podconfigs, for root/intermediate CA setup
-#pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_pki' ) | realpath }}"
-pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod3_pki' ) | realpath }}"
-
-# different, as passwords/SSH keys/cord_profile should be different
-credentials_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod3_credentials' ) | realpath }}"
-ssh_pki_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod3_ssh_pki' ) | realpath }}"
config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod3_profile' ) | realpath }}"
# path created on local system, mounted into corddev by Vagrant