2 files changed, 58 insertions, 3 deletions

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 359968277..e94d24023 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -1,9 +1,25 @@
 ---

 target_os: "Ubuntu"

-YARD_IMG_ARCH: "amd64"

+YARD_IMG_ARCH: "{{ YARD_IMAGE_ARCH | default('amd64') }}"

+IMG_PROPERTY: "{{ IMAGE_PROPERTY | default('normal') }}"

 clone_dest: /opt/tempT

-release: xenial

+release: "{{ OS_RELEASE  | default('xenial') }}"

 normal_image_file: "{{ workspace }}/yardstick-image.img"

 nsb_image_file: "{{ workspace }}/yardstick-nsb-image.img"

 ubuntu_image_file: /tmp/workspace/yardstick/yardstick-trusty-server.raw

-proxy_env: {}

+arch_amd64: "amd64"

+arch_arm64: "arm64"

+inst_mode_baremetal: "baremetal"

+inst_mode_container: "container"

+inst_mode_container_pull: "container_pull"

+ubuntu_archive:

+  "amd64": "http://archive.ubuntu.com/ubuntu/"

+  "arm64": "http://ports.ubuntu.com/ubuntu-ports/"

+installation_mode: "{{ INSTALLATION_MODE | default('baremetal') }}"

+yardstick_dir: "{{ YARDSTICK_DIR | default('/home/opnfv/repos/yardstick') }}"

+proxy_env:

+  PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/bin

+  http_proxy: "{{ lookup('env', 'http_proxy') }}"

+  https_proxy: "{{ lookup('env', 'https_proxy') }}"

+  ftp_proxy: "{{ lookup('env', 'ftp_proxy') }}"

+  no_proxy: "{{ lookup('env', 'no_proxy') }}"

diff --git a/ansible/group_vars/master.yml b/ansible/group_vars/master.yml
new file mode 100644
index 000000000..f5f703a2f
--- /dev/null
+++ b/ansible/group_vars/master.yml
@@ -0,0 +1,39 @@
+# Copyright (c) 2018-2019 Intel Corporation.
+#
+# 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.
+---
+cni_info:
+  multus-cni:
+    repo_url: https://github.com/Intel-Corp/multus-cni
+    repo_ver: v1.2
+    build_script: build
+  sriov-cni:
+    repo_url: https://github.com/Intel-Corp/sriov-cni
+    repo_ver: v0.4.0
+    build_script: build
+  containernetworking-cni:
+    repo_url: https://github.com/containernetworking/cni
+    repo_ver: v0.6.0
+    build_script: build.sh
+  containernetworking-plugins:
+    repo_url: https://github.com/containernetworking/plugins
+    repo_ver: v0.7.1
+    build_script: build.sh
+kubeadm_kubernetes_version: 1.9.3
+# Default CIDR defined in kube-flannel.yml
+kubeadm_pod_network_cidr: 10.244.0.0/16
+kubelet_cluster_dns_ip: 172.20.0.10
+docker_daemon_config:
+  bip: 172.10.1.1/16
+  fixed-cidr: 172.10.0.0/24
+  mtu: 1500