Fix COMAC sample configs
Change-Id: I3b4e9f2b2de01a0b1e05e993aa9e5c1681122b76
diff --git a/comac/sample/edge/hosts.ini b/comac/sample/edge/hosts.ini
deleted file mode 100644
index affd36b..0000000
--- a/comac/sample/edge/hosts.ini
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-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.
-
-[all]
-edge1 ansible_host=192.168.87.151 etcd_member_name=etcd1
-edge2 ansible_host=192.168.87.152 etcd_member_name=etcd2
-edge3 ansible_host=192.168.87.153 etcd_member_name=etcd3
-
-[kube-master]
-edge1
-edge2
-edge3
-
-[etcd]
-edge1
-edge2
-edge3
-
-[kube-node]
-edge1
-edge2
-edge3
-
-[k8s-cluster:children]
-kube-master
-kube-node
-
-[omec-dp]
-edge3
-
-[omec-dp:vars]
-node_labels={"omec-dp":"enabled"}
-
-[cdn-local]
-edge2
-
-[cdn-local:vars]
-node_labels={"cdn-local":"enabled"}
diff --git a/comac/sample/central/extra-vars.yaml b/comac/sample/kubespray-inventories/central/extra-vars.yaml
similarity index 100%
rename from comac/sample/central/extra-vars.yaml
rename to comac/sample/kubespray-inventories/central/extra-vars.yaml
diff --git a/comac/sample/central/group_vars b/comac/sample/kubespray-inventories/central/group_vars
similarity index 100%
rename from comac/sample/central/group_vars
rename to comac/sample/kubespray-inventories/central/group_vars
diff --git a/comac/sample/central/hosts.ini b/comac/sample/kubespray-inventories/central/hosts.ini
similarity index 77%
rename from comac/sample/central/hosts.ini
rename to comac/sample/kubespray-inventories/central/hosts.ini
index 8884dd6..c8e71ee 100644
--- a/comac/sample/central/hosts.ini
+++ b/comac/sample/kubespray-inventories/central/hosts.ini
@@ -13,26 +13,25 @@
# limitations under the License.
[all]
-central1 ansible_host=10.90.0.131 etcd_member_name=etcd1
-central2 ansible_host=10.90.0.132
+central1 ansible_host=10.90.0.151 etcd_member_name=etcd1
+central2 ansible_host=10.90.0.152 etcd_member_name=etcd2
+central3 ansible_host=10.90.0.153 etcd_member_name=etcd3
[kube-master]
central1
+central2
+central3
[etcd]
central1
+central2
+central3
[kube-node]
central1
central2
+central3
[k8s-cluster:children]
kube-master
kube-node
-
-[omec-cp]
-central1
-central2
-
-[omec-cp:vars]
-node_labels={"omec-cp":"enabled"}
diff --git a/comac/sample/edge/extra-vars.yaml b/comac/sample/kubespray-inventories/edge/extra-vars.yaml
similarity index 100%
rename from comac/sample/edge/extra-vars.yaml
rename to comac/sample/kubespray-inventories/edge/extra-vars.yaml
diff --git a/comac/sample/edge/group_vars b/comac/sample/kubespray-inventories/edge/group_vars
similarity index 100%
rename from comac/sample/edge/group_vars
rename to comac/sample/kubespray-inventories/edge/group_vars
diff --git a/comac/sample/central/hosts.ini b/comac/sample/kubespray-inventories/edge/hosts.ini
similarity index 75%
copy from comac/sample/central/hosts.ini
copy to comac/sample/kubespray-inventories/edge/hosts.ini
index 8884dd6..ab580c0 100644
--- a/comac/sample/central/hosts.ini
+++ b/comac/sample/kubespray-inventories/edge/hosts.ini
@@ -13,26 +13,25 @@
# limitations under the License.
[all]
-central1 ansible_host=10.90.0.131 etcd_member_name=etcd1
-central2 ansible_host=10.90.0.132
+edge1 ansible_host=10.90.0.131 etcd_member_name=etcd1
+edge2 ansible_host=10.90.0.132 etcd_member_name=etcd2
+edge3 ansible_host=10.90.0.133 etcd_member_name=etcd3
[kube-master]
-central1
+edge1
+edge2
+edge3
[etcd]
-central1
+edge1
+edge2
+edge3
[kube-node]
-central1
-central2
+edge1
+edge2
+edge3
[k8s-cluster:children]
kube-master
kube-node
-
-[omec-cp]
-central1
-central2
-
-[omec-cp:vars]
-node_labels={"omec-cp":"enabled"}
diff --git a/comac/sample/single/extra-vars.yaml b/comac/sample/kubespray-inventories/single/extra-vars.yaml
similarity index 100%
rename from comac/sample/single/extra-vars.yaml
rename to comac/sample/kubespray-inventories/single/extra-vars.yaml
diff --git a/comac/sample/single/group_vars b/comac/sample/kubespray-inventories/single/group_vars
similarity index 100%
rename from comac/sample/single/group_vars
rename to comac/sample/kubespray-inventories/single/group_vars
diff --git a/comac/sample/single/hosts.ini b/comac/sample/kubespray-inventories/single/hosts.ini
similarity index 99%
rename from comac/sample/single/hosts.ini
rename to comac/sample/kubespray-inventories/single/hosts.ini
index 06be3e8..e8ca265 100644
--- a/comac/sample/single/hosts.ini
+++ b/comac/sample/kubespray-inventories/single/hosts.ini
@@ -38,9 +38,9 @@
[omec-cp]
node1
-node2
[omec-dp]
+node2
node3
[omec-cp:vars]
diff --git a/comac/sample/omec-override-values-multi.yaml b/comac/sample/override-values-multi.yaml
similarity index 98%
rename from comac/sample/omec-override-values-multi.yaml
rename to comac/sample/override-values-multi.yaml
index e645f39..c5d4227 100644
--- a/comac/sample/omec-override-values-multi.yaml
+++ b/comac/sample/override-values-multi.yaml
@@ -15,7 +15,7 @@
# Sample override values for 3-nodes cluster with SR-IOV configured on DP node.
cassandra:
config:
- cluster_size: 1
+ cluster_size: 3
config:
sriov:
@@ -23,6 +23,12 @@
vfio:
pfNames:
- eth2
+ netDevice:
+ pfNames:
+ - eth2
+ drivers:
+ - i40evf
+ - ixgbevf
mme:
cfgFiles:
config.json:
@@ -55,7 +61,7 @@
unreachability: 1
spgwu:
cpComm:
- addr: 10.90.0.131
+ addr: 10.90.0.151
port: 30021
dpComm:
nodePort:
@@ -67,7 +73,7 @@
enabled: true
port: 30021
dpComm:
- addr: 192.168.87.151
+ addr: 10.90.0.131
port: 30020
cfgFiles:
adc_rules.cfg: |
@@ -397,7 +403,7 @@
# CDN configuration values
cdnRemotes:
- name: remote-1
- ip: 10.90.0.131
+ ip: 10.90.0.151
port: 30935
streams:
- name: 360p
@@ -407,9 +413,6 @@
- name: 720p
value: 720
-nodeSelectors:
- enabled: true
-
# cord-platform values
etcd-operator:
enabled: false
diff --git a/comac/sample/omec-override-values.yaml b/comac/sample/override-values-single.yaml
similarity index 98%
rename from comac/sample/omec-override-values.yaml
rename to comac/sample/override-values-single.yaml
index 997b0e7..a9ec13a 100644
--- a/comac/sample/omec-override-values.yaml
+++ b/comac/sample/override-values-single.yaml
@@ -16,6 +16,7 @@
cassandra:
config:
cluster_size: 1
+ seed_size: 1
config:
sriov:
@@ -23,6 +24,12 @@
vfio:
pfNames:
- eth2
+ netDevice:
+ pfNames:
+ - eth2
+ drivers:
+ - i40evf
+ - ixgbevf
mme:
cfgFiles:
config.json:
@@ -382,7 +389,7 @@
# CDN configuration values
cdnRemotes:
- name: remote-1
- ip: 10.90.0.131
+ ip: 10.0.0.240
port: 30935
streams:
- name: 360p