Fix COMAC sample configs
Change-Id: I3b4e9f2b2de01a0b1e05e993aa9e5c1681122b76
diff --git a/comac/sample/kubespray-inventories/central/extra-vars.yaml b/comac/sample/kubespray-inventories/central/extra-vars.yaml
new file mode 100644
index 0000000..c4549ab
--- /dev/null
+++ b/comac/sample/kubespray-inventories/central/extra-vars.yaml
@@ -0,0 +1,55 @@
+# 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.
+
+# Sample kubespray override variables for COMAC deploy.
+# Pass this file as an extra variables when running kubespray. For example,
+# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
+# Tested with Kubespray release-2.11
+
+# OS
+disable_swap: true
+populate_inventory_to_hosts_file: true
+
+# etcd
+etcd_deployment_type: docker
+etcd_memory_limit: 8192M
+
+# Docker
+docker_iptables_enabled: true
+
+# K8S
+kubeadm_enabled: true
+kubelet_deployment_type: host
+kubectl_localhost: true
+kubeconfig_localhost: true
+
+kube_feature_gates: [SCTPSupport=True]
+kube_pods_subnet: 172.18.0.0/17
+kube_service_addresses: 172.18.128.0/17
+kube_apiserver_node_port_range: 2000-36767
+kube_network_plugin: calico
+kube_network_plugin_multus: true
+multus_version: stable
+ipip: false
+
+local_volume_provisioner_enabled: true
+
+# Applications
+dns_mode: coredns
+dns_cores_per_replica: 256
+dns_min_replicas: 1
+
+helm_enabled: true
+helm_deployment_type: host
+helm_version: v2.14.2
diff --git a/comac/sample/kubespray-inventories/central/group_vars b/comac/sample/kubespray-inventories/central/group_vars
new file mode 120000
index 0000000..a30ba68
--- /dev/null
+++ b/comac/sample/kubespray-inventories/central/group_vars
@@ -0,0 +1 @@
+../sample/group_vars
\ No newline at end of file
diff --git a/comac/sample/kubespray-inventories/central/hosts.ini b/comac/sample/kubespray-inventories/central/hosts.ini
new file mode 100644
index 0000000..c8e71ee
--- /dev/null
+++ b/comac/sample/kubespray-inventories/central/hosts.ini
@@ -0,0 +1,37 @@
+# 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]
+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
diff --git a/comac/sample/kubespray-inventories/edge/extra-vars.yaml b/comac/sample/kubespray-inventories/edge/extra-vars.yaml
new file mode 100644
index 0000000..c4549ab
--- /dev/null
+++ b/comac/sample/kubespray-inventories/edge/extra-vars.yaml
@@ -0,0 +1,55 @@
+# 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.
+
+# Sample kubespray override variables for COMAC deploy.
+# Pass this file as an extra variables when running kubespray. For example,
+# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
+# Tested with Kubespray release-2.11
+
+# OS
+disable_swap: true
+populate_inventory_to_hosts_file: true
+
+# etcd
+etcd_deployment_type: docker
+etcd_memory_limit: 8192M
+
+# Docker
+docker_iptables_enabled: true
+
+# K8S
+kubeadm_enabled: true
+kubelet_deployment_type: host
+kubectl_localhost: true
+kubeconfig_localhost: true
+
+kube_feature_gates: [SCTPSupport=True]
+kube_pods_subnet: 172.18.0.0/17
+kube_service_addresses: 172.18.128.0/17
+kube_apiserver_node_port_range: 2000-36767
+kube_network_plugin: calico
+kube_network_plugin_multus: true
+multus_version: stable
+ipip: false
+
+local_volume_provisioner_enabled: true
+
+# Applications
+dns_mode: coredns
+dns_cores_per_replica: 256
+dns_min_replicas: 1
+
+helm_enabled: true
+helm_deployment_type: host
+helm_version: v2.14.2
diff --git a/comac/sample/kubespray-inventories/edge/group_vars b/comac/sample/kubespray-inventories/edge/group_vars
new file mode 120000
index 0000000..a30ba68
--- /dev/null
+++ b/comac/sample/kubespray-inventories/edge/group_vars
@@ -0,0 +1 @@
+../sample/group_vars
\ No newline at end of file
diff --git a/comac/sample/kubespray-inventories/edge/hosts.ini b/comac/sample/kubespray-inventories/edge/hosts.ini
new file mode 100644
index 0000000..ab580c0
--- /dev/null
+++ b/comac/sample/kubespray-inventories/edge/hosts.ini
@@ -0,0 +1,37 @@
+# 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=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]
+edge1
+edge2
+edge3
+
+[etcd]
+edge1
+edge2
+edge3
+
+[kube-node]
+edge1
+edge2
+edge3
+
+[k8s-cluster:children]
+kube-master
+kube-node
diff --git a/comac/sample/kubespray-inventories/single/extra-vars.yaml b/comac/sample/kubespray-inventories/single/extra-vars.yaml
new file mode 100644
index 0000000..c4549ab
--- /dev/null
+++ b/comac/sample/kubespray-inventories/single/extra-vars.yaml
@@ -0,0 +1,55 @@
+# 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.
+
+# Sample kubespray override variables for COMAC deploy.
+# Pass this file as an extra variables when running kubespray. For example,
+# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
+# Tested with Kubespray release-2.11
+
+# OS
+disable_swap: true
+populate_inventory_to_hosts_file: true
+
+# etcd
+etcd_deployment_type: docker
+etcd_memory_limit: 8192M
+
+# Docker
+docker_iptables_enabled: true
+
+# K8S
+kubeadm_enabled: true
+kubelet_deployment_type: host
+kubectl_localhost: true
+kubeconfig_localhost: true
+
+kube_feature_gates: [SCTPSupport=True]
+kube_pods_subnet: 172.18.0.0/17
+kube_service_addresses: 172.18.128.0/17
+kube_apiserver_node_port_range: 2000-36767
+kube_network_plugin: calico
+kube_network_plugin_multus: true
+multus_version: stable
+ipip: false
+
+local_volume_provisioner_enabled: true
+
+# Applications
+dns_mode: coredns
+dns_cores_per_replica: 256
+dns_min_replicas: 1
+
+helm_enabled: true
+helm_deployment_type: host
+helm_version: v2.14.2
diff --git a/comac/sample/kubespray-inventories/single/group_vars b/comac/sample/kubespray-inventories/single/group_vars
new file mode 120000
index 0000000..a30ba68
--- /dev/null
+++ b/comac/sample/kubespray-inventories/single/group_vars
@@ -0,0 +1 @@
+../sample/group_vars
\ No newline at end of file
diff --git a/comac/sample/kubespray-inventories/single/hosts.ini b/comac/sample/kubespray-inventories/single/hosts.ini
new file mode 100644
index 0000000..e8ca265
--- /dev/null
+++ b/comac/sample/kubespray-inventories/single/hosts.ini
@@ -0,0 +1,50 @@
+# 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]
+node1 ansible_host=10.0.0.240 etcd_member_name=etcd1
+node2 ansible_host=10.0.0.241 etcd_member_name=etcd2
+node3 ansible_host=10.0.0.242 etcd_member_name=etcd3
+
+[kube-master]
+node1
+node2
+node3
+
+[etcd]
+node1
+node2
+node3
+
+[kube-node]
+node1
+node2
+node3
+
+[k8s-cluster:children]
+kube-master
+kube-node
+
+[omec-cp]
+node1
+
+[omec-dp]
+node2
+node3
+
+[omec-cp:vars]
+node_labels={"omec-cp":"enabled"}
+
+[omec-dp:vars]
+node_labels={"omec-dp":"enabled"}