Merge "Revert "Add switch roles to POD deployment config"" into cord-4.0
diff --git a/deployment-configs/nttcomm-pod1.yml b/deployment-configs/nttcomm-pod1.yml
index 0dca8db..5c078e3 100644
--- a/deployment-configs/nttcomm-pod1.yml
+++ b/deployment-configs/nttcomm-pod1.yml
@@ -40,18 +40,18 @@
-
ipmi:
ip: '192.168.18.52'
- user: 'OCPQ'
- pass: 'OCPQ'
+ user: 'Administrator'
+ pass: 'Administrator'
-
ipmi:
ip: '192.168.18.53'
- user: 'OCPQ'
- pass: 'OCPQ'
+ user: 'Administrator'
+ pass: 'Administrator'
-
ipmi:
ip: '192.168.18.54'
- user: 'OCPQ'
- pass: 'OCPQ'
+ user: 'Administrator'
+ pass: 'Administrator'
fabric_switches:
-
diff --git a/deployment-configs/ntteast-pod1.yml b/deployment-configs/ntteast-pod1.yml
new file mode 100644
index 0000000..9bf77b3
--- /dev/null
+++ b/deployment-configs/ntteast-pod1.yml
@@ -0,0 +1,56 @@
+# 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: 'ntteast-pod1.yml'
+
+make_release: 'false'
+
+maas:
+ ip: '192.168.99.60'
+ api_key: 'PsfrZpCyXZhwRQ8Wbb:DcNjKqVchaTQjJ3BvJ:GjFsRmbxgB8p5JuZu9MQGVPxsrkwrG8a'
+ head_system_id: '8bswf6'
+
+dev_node:
+ name: 'ntteast-cord-pod1'
+ user: 'cord'
+
+head:
+ ip: '192.168.99.61'
+ user: 'cord'
+ pass: 'cord'
+
+compute_nodes:
+ -
+ ipmi:
+ ip: '192.168.99.52'
+ user: 'Administrator'
+ pass: 'Administrator'
+ -
+ ipmi:
+ ip: '192.168.99.53'
+ user: 'Administrator'
+ pass: 'Administrator'
+
+fabric_switches:
+ -
+ mac: 'cc:37:ab:c1:26:a0'
+ ip: '10.6.0.101'
+ user: 'root'
+ pass: 'onl'
diff --git a/deployment-configs/qct-pod2.yml b/deployment-configs/qct-pod2.yml
index c781216..932f19c 100644
--- a/deployment-configs/qct-pod2.yml
+++ b/deployment-configs/qct-pod2.yml
@@ -25,7 +25,7 @@
maas:
ip: '10.201.101.254'
api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
- head_system_id: 'bqqqkm'
+ head_system_id: 'tffdpw'
dev_node:
name: 'qct-cord-pod2'
diff --git a/deployment-configs/qct-pod3-ecord-global.yml b/deployment-configs/qct-pod3-ecord-global.yml
index 4f48212..756dc6b 100644
--- a/deployment-configs/qct-pod3-ecord-global.yml
+++ b/deployment-configs/qct-pod3-ecord-global.yml
@@ -35,15 +35,3 @@
ip: '10.201.101.31'
user: 'cord'
pass: 'cord'
-
-compute_nodes:
- -
- ipmi:
- ip: '10.201.101.33'
- user: 'OCPQ'
- pass: 'OCPQ'
- -
- ipmi:
- ip: '10.201.101.34'
- user: 'OCPQ'
- pass: 'OCPQ'
diff --git a/deployment-configs/qct-pod4-mcord.yml b/deployment-configs/qct-pod4-mcord.yml
index 6b38154..541f0f4 100644
--- a/deployment-configs/qct-pod4-mcord.yml
+++ b/deployment-configs/qct-pod4-mcord.yml
@@ -42,8 +42,3 @@
ip: '10.201.101.43'
user: 'OCPQ'
pass: 'OCPQ'
- -
- ipmi:
- ip: '10.201.101.44'
- user: 'OCPQ'
- pass: 'OCPQ'
diff --git a/nttcomm-pod1.yml b/nttcomm-pod1.yml
index 14e2fb8..895c0e8 100644
--- a/nttcomm-pod1.yml
+++ b/nttcomm-pod1.yml
@@ -55,12 +55,16 @@
docker_images_prereqs:
- 'prep-headnode'
-# node topology
+# Node topology
physical_node_list:
- name: head1
aliases:
- head
+# Extra network config
+fabric_include_names: 'eth4'
+management_ignore_names: 'eth0,eth1,eth3,eth4,eth5'
+
# Inventory for ansible, used to generate inventory.ini
inventory_groups:
config:
diff --git a/ntteast-pod1.yml b/ntteast-pod1.yml
new file mode 100644
index 0000000..e0e95cd
--- /dev/null
+++ b/ntteast-pod1.yml
@@ -0,0 +1,80 @@
+---
+# 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.99.61/24'
+external_gw: '192.168.99.1'
+external_iface: 'eno1'
+management_network: 10.6.0.0/24
+
+deploy_docker_registry: "192.168.99.61:5000"
+
+headnode: cord@192.168.99.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
+
+# Extra network config
+fabric_include_names: 'ens3f0'
+management_include_names: 'eno2'
+management_ignore_names: 'ens3f0,ens3f1,ens6f0,ens6f1'
+
+# Inventory for ansible, used to generate inventory.ini
+inventory_groups:
+ config:
+ localhost:
+ ansible_connection: local
+ build:
+ corddev:
+ head:
+ head1:
+ ansible_host: 192.168.99.61
+ ansible_port: 22
+ ansible_user: cord
+ ansible_ssh_pass: cord
+ compute:
diff --git a/qct-pod2.yml b/qct-pod2.yml
index e666c2f..d4881b1 100644
--- a/qct-pod2.yml
+++ b/qct-pod2.yml
@@ -30,7 +30,7 @@
management_ip: '10.6.0.1/24'
external_ip: '10.201.101.21/24'
external_gw: '10.201.101.1'
-external_iface: 'eth2'
+external_iface: 'eth0'
management_network: 10.6.0.0/24
deploy_docker_registry: "10.201.101.21:5000"
@@ -55,13 +55,9 @@
docker_images_prereqs:
- 'prep-headnode'
-# node topology
-physical_node_list:
- - name: head1
- aliases:
- - head
-
-management_ignore_names: 'eth0'
+# 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:
@@ -77,3 +73,4 @@
ansible_user: cord
ansible_ssh_pass: cord
compute:
+