Revert "Modifying pod config for ONF pod"
This reverts commit a8d11efee52f257871ba7cba4e625094705339d3.
Change-Id: I8f29645fd7fa3c26d75a8a5e99f7e875ad42b895
diff --git a/deployment-configs/onlab-pod1.yml b/deployment-configs/onlab-pod1.yml
index aaf734e..76af42a 100644
--- a/deployment-configs/onlab-pod1.yml
+++ b/deployment-configs/onlab-pod1.yml
@@ -16,39 +16,56 @@
---
-nodes:
+pod_config:
+ repo_url: 'https://gerrit.opencord.org/pod-configs'
+ file_name: 'onlab.yml'
+
+make_release: 'false'
+
+maas:
+ ip: '10.90.0.2'
+ api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
+ head_system_id: '4y3h8d'
+
+dev_node:
+ name: 'build'
+ user: 'ubuntu'
+
+head:
+ ip: '10.90.0.251'
+ user: 'cord'
+ pass: 'cord'
+
+compute_nodes:
-
- ip: '10.90.0.101'
- user: 'cord'
- pass: 'cord'
+ ipmi:
+ ip: '10.90.0.10'
+ user: 'admin'
+ pass: 'admin'
-
- ip: '10.90.0.102'
- user: 'cord'
- pass: 'cord'
- -
- ip: '10.90.0.103'
- user: 'cord'
- pass: 'cord'
+ ipmi:
+ ip: '10.90.0.11'
+ user: 'admin'
+ pass: 'admin'
fabric_switches:
+ #-
+ # mac: 'cc:37:ab:61:7e:c2'
+ # ip: '10.6.0.101'
+ # user: 'root'
+ # pass: 'onl'
+ -
+ mac: 'cc:37:ab:61:80:48'
+ ip: '10.6.0.102'
+ user: 'root'
+ pass: 'onl'
-
mac: 'cc:37:ab:61:80:ca'
- ip: '10.6.0.111'
+ ip: '10.6.0.103'
user: 'root'
pass: 'onl'
-
-olts:
-
- ip: '10.90.0.114'
+ mac: 'cc:37:ab:61:82:d2'
+ ip: '10.6.0.104'
user: 'root'
pass: 'onl'
-
-onus:
- -
- serial: 'BRCM22222222'
-
-srcHost:
- ip: '10.0.3.56'
- user: 'root'
- pass: 'root'
-
diff --git a/qct-pod2-preppedkube.yml b/qct-pod2-preppedkube.yml
deleted file mode 100644
index 1878517..0000000
--- a/qct-pod2-preppedkube.yml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-# 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
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.21/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.21:5000"
-
-headnode: cord@10.201.101.21
-
-# 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'
-
-# set which interfaces to use for fabric/mgmt network
-fabric_include_names: 'eth2'
-management_exclude_names: 'eth0,eth2'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
- config:
- localhost:
- ansible_connection: local
- build:
- corddev:
- head:
- head1:
- ansible_host: 10.201.101.21
- ansible_port: 22
- ansible_user: cord
- ansible_ssh_pass: cord
- compute:
-