Merge "Avoid vagrant-specific bits of single scenario for ecord-global on physical hardware"
diff --git a/deployment-configs/calix-pod1.yml b/deployment-configs/calix-pod1.yml
index 56688cf..5e011d8 100644
--- a/deployment-configs/calix-pod1.yml
+++ b/deployment-configs/calix-pod1.yml
@@ -54,18 +54,22 @@
     ip: '10.6.0.101'
     user: 'root'
     pass: 'onl'
+    role: 'spine-1'
   -
     mac: '48:0f:cf:ae:6e:0a'
     ip: '10.6.0.102'
     user: 'root'
     pass: 'onl'
+    role: 'spine-2'
   -
     mac: '48:0f:cf:ae:ee:ac'
     ip: '10.6.0.103'
     user: 'root'
     pass: 'onl'
+    role: 'leaf-1'
   -
     mac: '48:0f:cf:ae:de:a8'
     ip: '10.6.0.104'
     user: 'root'
     pass: 'onl'
+    role: 'leaf-2'
diff --git a/deployment-configs/flex-pod1.yml b/deployment-configs/flex-pod1.yml
index 235f799..a7e0adf 100644
--- a/deployment-configs/flex-pod1.yml
+++ b/deployment-configs/flex-pod1.yml
@@ -59,18 +59,22 @@
     ip: '10.6.0.101'
     user: 'root'
     pass: 'onl'
+    role: 'spine-1'
   -
     mac: 'cc:37:ab:b6:b5:64'
     ip: '10.6.0.102'
     user: 'root'
     pass: 'onl'
+    role: 'leaf-2'
   -
     mac: 'cc:37:ab:d9:37:69'
     ip: '10.6.0.103'
     user: 'root'
     pass: 'onl'
+    role: 'leaf-1'
   -
     mac: 'cc:37:ab:5b:6d:a8'
     ip: '10.6.0.104'
     user: 'root'
     pass: 'onl'
+    role: 'spine-2'
diff --git a/deployment-configs/nttcomm-pod1.yml b/deployment-configs/nttcomm-pod1.yml
new file mode 100644
index 0000000..0dca8db
--- /dev/null
+++ b/deployment-configs/nttcomm-pod1.yml
@@ -0,0 +1,76 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for QCT POD 1
+
+---
+
+pod_config:
+  repo_url: 'https://gerrit.opencord.org/pod-configs'
+  file_name: 'nttcomm-pod1.yml'
+
+make_release: 'true'
+
+maas:
+  ip: '192.168.18.60'
+  api_key: 'aCdu75LWyhMqMX9C6g:q6s39tsvRzLesSUXa5:VgrbVQx5FpQwk3PmJLED82RVSn2AqpPS'
+  head_system_id: 'h4ecwg'
+
+dev_node:
+  name: 'nttcomm-cord-pod1'
+  user: 'cord'
+
+head:
+  ip: '192.168.18.61'
+  user: 'cord'
+  pass: 'cord'
+
+compute_nodes:
+  -
+    ipmi:
+      ip: '192.168.18.52'
+      user: 'OCPQ'
+      pass: 'OCPQ'
+  -
+    ipmi:
+      ip: '192.168.18.53'
+      user: 'OCPQ'
+      pass: 'OCPQ'
+  -
+    ipmi:
+      ip: '192.168.18.54'
+      user: 'OCPQ'
+      pass: 'OCPQ'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:a0:e5:bd'
+    ip: '10.6.0.101'
+    user: 'root'
+    pass: 'onl'
+  -
+    mac: 'cc:37:ab:a0:e4:37'
+    ip: '10.6.0.102'
+    user: 'root'
+    pass: 'onl'
+  -
+    mac: 'cc:37:ab:a0:e3:b5'
+    ip: '10.6.0.103'
+    user: 'root'
+    pass: 'onl'
+  -
+    mac: 'cc:37:ab:a0:dd:9d'
+    ip: '10.6.0.104'
+    user: 'root'
+    pass: 'onl'
diff --git a/deployment-configs/qct-pod1.yml b/deployment-configs/qct-pod1.yml
index 82ad7bb..f265907 100644
--- a/deployment-configs/qct-pod1.yml
+++ b/deployment-configs/qct-pod1.yml
@@ -38,17 +38,11 @@
 
 compute_nodes:
   -
-    mac: '2c:60:0c:6f:b6:76'
-    ip: '10.6.0.201'
-    switch: '48:0f:cf:ae:de:26'
     ipmi:
       ip: '10.201.101.13'
       user: 'OCPQ'
       pass: 'OCPQ'
   -
-    mac: '2c:60:0c:6f:b6:04'
-    ip: '10.6.0.202'
-    switch: '48:0f:cf:ae:ee:2a'
     ipmi:
       ip: '10.201.101.14'
       user: 'OCPQ'
diff --git a/nttcomm-pod1.yml b/nttcomm-pod1.yml
new file mode 100644
index 0000000..14e2fb8
--- /dev/null
+++ b/nttcomm-pod1.yml
@@ -0,0 +1,77 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+
+cord_scenario: cord
+cord_profile: rcord
+
+vagrant_vms:
+  - '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: '192.168.18.61/24'
+external_gw: '192.168.18.251'
+external_iface: 'eno1'
+management_network: 10.6.0.0/24
+
+deploy_docker_registry: "192.168.18.61:5000"
+
+headnode: cord@192.168.18.61
+
+# 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
+host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
+
+build_targets:
+  - 'setup-automation'
+
+copy_cord_prereqs:
+  - 'config-ssh-key'
+
+skipTags:
+  - 'set_compute_node_password'
+
+# Wait until headnode prepped before building containers, for consistent DNS
+docker_images_prereqs:
+  - 'prep-headnode'
+
+# node topology
+physical_node_list:
+  - name: head1
+    aliases:
+      - head
+
+# Inventory for ansible, used to generate inventory.ini
+inventory_groups:
+  config:
+    localhost:
+      ansible_connection: local
+  build:
+    corddev:
+  head:
+    head1:
+      ansible_host: 192.168.18.61
+      ansible_port: 22
+      ansible_user: cord
+      ansible_ssh_pass: cord
+  compute: