Fixes for ONF ecord pods, clarity
Change-Id: If067c622048e0db4396932dcc2286ac3d0058719
(cherry picked from commit f08ac6d4e21fc9832961d68f60f5f425c4f90b67)
diff --git a/onlab-ecord-global.yml b/onlab-ecord-global.yml
index c39631d..a351bf5 100644
--- a/onlab-ecord-global.yml
+++ b/onlab-ecord-global.yml
@@ -17,6 +17,15 @@
cord_scenario: single
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:
- deploy-onos
@@ -32,6 +41,9 @@
- copy-cord
- copy-config
+headnode: cord@10.90.1.10
+buildnode: cord@10.90.1.10
+
# Inventory for ansible, used to generate inventory.ini
inventory_groups:
config:
diff --git a/onlab-ecord-local-pod1.yml b/onlab-ecord-local-pod1.yml
index b3a7d35..12b9182 100644
--- a/onlab-ecord-local-pod1.yml
+++ b/onlab-ecord-local-pod1.yml
@@ -17,13 +17,17 @@
cord_scenario: cord
cord_profile: ecord
-vagrant_vms:
- - 'corddev'
-
# Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
+# 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_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
+host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
fabric_ip: '10.6.1.1/24'
management_ip: '10.6.0.1/24'
@@ -34,11 +38,8 @@
deploy_docker_registry: "10.90.1.30:5000"
-headnode: cord@10.90.1.30
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
+vagrant_vms:
+ - 'corddev'
build_targets:
- 'setup-automation'
@@ -53,11 +54,8 @@
docker_images_prereqs:
- 'prep-headnode'
-# node topology
-physical_node_list:
- - name: head1
- aliases:
- - head
+# headnode to ssh to for some make tasks
+headnode: cord@10.90.1.30
# Inventory for ansible, used to generate inventory.ini
inventory_groups:
@@ -73,3 +71,4 @@
ansible_user: cord
ansible_ssh_pass: cord
compute:
+
diff --git a/qct-pod3-ecord-local.yml b/qct-pod3-ecord-local.yml
index 384d263..e288ee9 100644
--- a/qct-pod3-ecord-local.yml
+++ b/qct-pod3-ecord-local.yml
@@ -20,21 +20,16 @@
- 'corddev'
# Variables
-credentials_dir: '/opt/credentials'
-pki_dir: '/opt/pki'
-ssh_pki_dir: '/opt/ssh_pki'
-
fabric_ip: '10.6.1.1/24'
management_ip: '10.6.0.1/24'
external_ip: '10.201.101.31/24'
external_gw: '10.201.101.1'
external_iface: 'eth2'
management_network: 10.6.0.0/24
+management_ignore_names: 'eth0'
deploy_docker_registry: "10.201.101.31:5000"
-headnode: cord@10.201.101.31
-
# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
# one level up from the `cord` directory
@@ -53,13 +48,8 @@
docker_images_prereqs:
- 'prep-headnode'
-# node topology
-physical_node_list:
- - name: head1
- aliases:
- - head
-
-management_ignore_names: 'eth0'
+# headnode to ssh to for some make tasks
+headnode: cord@10.201.101.31
# Inventory for ansible, used to generate inventory.ini
inventory_groups: