Merge pull request #103 from open-ness/openness_release_2103

Openness release 2103

Author: cjnolan

.ansible-lint

@@ -17,3 +17,4 @@ exclude_paths:
   - roles/telemetry/opentelemetry/controlplane/charts
   - roles/bb_config/charts
   - cloud
+  - inventory.yml

.gitignore

@@ -1,4 +1,5 @@
 /biosfw/
 /logs/
 *.pyc
-/group_vars/*/30_*_flavor.yml
+/inventory/default/group_vars/*/30_*_flavor.yml
+/inventory/automated/

Makefile

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+
+# Provide `ANSIBLE_LINT_VERBOSITY=-v make ansible-lint` to enable verbose output.
+# Switch required to verify CI.
+ANSIBLE_LINT_ARGS?=
+PIPENV_INSTALL_ARGS?=--user
+PIPENV_VERSION?=2020.11.15
+
+install-dependencies:
+	pip install $(PIPENV_INSTALL_ARGS) pipenv==$(PIPENV_VERSION)
+	pipenv sync
+
+lint: ansible-lint pylint shellcheck
+
+ansible-lint:
+	@pipenv run ansible-lint --version || (echo "pipenv is required, please run 'make install-dependencies'"; exit 1)
+	pipenv run ansible-lint network_edge*.yml single_node_network_edge.yml --parseable-severity  -c .ansible-lint $(ANSIBLE_LINT_VERBOSITY)
+
+pylint:
+	@pipenv run pylint --version || (echo "pipenv is required, please run 'make install-dependencies'"; exit 1)
+	find . -type f -name "*.py" | xargs pipenv run pylint
+
+shellcheck:
+	@shellcheck --version || (echo "shellcheck is required, please install it from https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz"; exit 1)
+	find . -type f -name "*.sh" | xargs shellcheck

Pipfile

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+ansible = "==2.9.18"
+ansible-lint = "==4.2.0"
+jinja2 = "==2.11.3"
+pylint = "==2.7.2"
+netaddr = "==0.7.18"
+sh = "==1.14.1"
+# Force 3.2 due to security vulnabilities in 3.4.6
+cryptography = "==3.2"
+
+[requires]
+python_version = "3.6"

Pipfile.lock

@@ -3,4 +3,4 @@ SPDX-License-Identifier: Apache-2.0
 Copyright (c) 2019 Intel Corporation
 ```
 
-For documentation please refer to https://github.com/open-ness/specs/blob/master/doc/getting-started/openness-experience-kits.md
+For documentation please refer to https://github.com/open-ness/specs/blob/master/doc/getting-started/converged-edge-experience-kits.md

README.md

@@ -50,7 +50,8 @@ def get_variable(self, arg):
         return def_val.get('value')
 
     def run(self, tmp=None, task_vars=None):
-        super(ActionModule, self).run(tmp, task_vars)
+        # NOTE: pylint disable used here to keep the Python 2 support.
+        super(ActionModule, self).run(tmp, task_vars) # pylint: disable=bad-option-value,super-with-arguments
         self.module_args = self._task.args.copy()
         self.task_vars = task_vars
 

action_plugins/yum.py

@@ -4,7 +4,10 @@
 [defaults]
 host_key_checking = False
 show_custom_stats = True
+callback_whitelist = profile_roles
 stdout_callback = debug
+roles_path = ./roles
+timeout = 60
 
 [connection]
 pipelining = True

ansible.cfg

@@ -5,14 +5,14 @@
 
 # Usage:
 #  Regular Network Edge mode:
-#   ./deploy_ne.sh [-f <flavor>]               deploy both controller & nodes
-#   ./deploy_ne.sh [-f <flavor>] c[ontroller]  deploy only controller
-#   ./deploy_ne.sh [-f <flavor>] n[odes]       deploy only nodes
+#   ./auto_val.sh -f <flavor>               deploy both controller & nodes
+#   ./auto_val.sh -f <flavor> c[ontroller]  deploy only controller
+#   ./auto_val.sh -f <flavor> n[odes]       deploy only nodes
 #
 #  Single-node cluster:
-#   ./deploy_ne.sh [-f <flavor>] s[ingle]      deploy single-node cluster playbook
+#   ./auto_val.sh -f <flavor> s[ingle]      deploy single-node cluster playbook
 
-set -eu
+set -euxo pipefail
 
 source scripts/ansible-precheck.sh
 source scripts/task_log_file.sh
@@ -33,11 +33,13 @@ done
 shift $((OPTIND-1))
 
 # Remove all previous flavors
-find "${PWD}/group_vars/" -type l -name "30_*_flavor.yml" -delete
+find "${PWD}/inventory/default/group_vars/" -type l -name "30_*_flavor.yml" -delete
 
 if [[ -z "${flavor}" ]]; then
-    echo "No flavor provided"
-    echo -e "   $0 [-f <flavor>] <filter>. Available flavors: $(ls -m flavors)"
+    echo "No flavor provided, please choose specific flavor"
+    echo -e "   $0 -f <flavor> <filter>"
+    echo "Available flavors: minimal, $(ls -m flavors -I minimal)"
+    exit 1
 else
     flavor_path="${PWD}/flavors/${flavor}"
     if [[ ! -d "${flavor_path}" ]]; then
@@ -48,10 +50,10 @@ else
     for f in "${flavor_path}"/*.yml
     do
         fname=$(basename "${f}" .yml)
-        dir="${PWD}/group_vars/${fname}"
+        dir="${PWD}/inventory/default/group_vars/${fname}"
         if [[ ! -d "${dir}" ]]; then
             echo "${f} does not match a directory in group_vars:"
-            ls "${PWD}/group_vars/"
+            ls "${PWD}/inventory/default/group_vars/"
             exit 1
         fi
         ln -sfn "${f}" "${dir}/30_${flavor}_flavor.yml"
@@ -61,19 +63,19 @@ fi
 limit=""
 filter="${1:-}"
 
+playbook="network_edge.yml"
+
 if [[ "${filter}" == s* ]]; then
     playbook="single_node_network_edge.yml"
 elif [[ "${flavor}" == central_orchestrator ]]; then
-    playbook="network_edge_orchestrator.yml"
     limit=$(get_limit "c")
 else
-    playbook="network_edge.yml"
     limit=$(get_limit "${filter}")
 fi
 
 eval ansible-playbook -vv \
     "${playbook}" \
-    --inventory inventory.ini "${limit}"
+    --inventory inventory/default/inventory.ini "${limit}"
 
 if ! python3 scripts/log_all.py; then
     echo "[Warning] Log collection failed"

deploy_ne.sh auto_val.shdeploy_ne.sh renamed to auto_val.sh

@@ -3,6 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) 2019-2020 Intel Corporation
 
+# Usage:
+#  Regular Network Edge mode:
+#   ./auto_val_cleanup.sh -f <flavor>               cleanup both controller & nodes
+#   ./auto_val_cleanup.sh -f <flavor> c[ontroller]  cleanup only controller
+#   ./auto_val_cleanup.sh -f <flavor> n[odes]       cleanup only nodes
+
 source scripts/ansible-precheck.sh
 source scripts/task_log_file.sh
 source scripts/parse_args.sh
@@ -22,11 +28,13 @@ done
 shift $((OPTIND-1))
 
 # Remove all previous flavors
-find "${PWD}/group_vars/" -type l -name "30_*_flavor.yml" -delete
+find "${PWD}/inventory/default/group_vars/" -type l -name "30_*_flavor.yml" -delete
 
 if [[ -z "${flavor}" ]]; then
     echo "No flavor provided"
-    echo -e "   $0 [-f <flavor>] <filter>. Available flavors: $(ls -m flavors)"
+    echo -e "   $0 -f <flavor> <filter>"
+    echo "Available flavors: minimal, $(ls -m flavors -I minimal)"
+    exit 1
 else
     flavor_path="${PWD}/flavors/${flavor}"
     if [[ ! -d "${flavor_path}" ]]; then
@@ -37,7 +45,7 @@ else
     for f in "${flavor_path}"/*.yml
     do
         fname=$(basename "${f}" .yml)
-        dir="${PWD}/group_vars/${fname}"
+        dir="${PWD}/inventory/default/group_vars/${fname}"
         if [[ -f "${dir}/30_${flavor}_flavor.yml" ]]; then
             rm -f "${dir}/30_${flavor}_flavor.yml"
         fi
@@ -47,14 +55,14 @@ fi
 limit=""
 filter="${1:-}"
 
+playbook="network_edge_cleanup.yml"
+
 if [[ "${flavor}" == central_orchestrator ]]; then
-    playbook="network_edge_orchestrator_cleanup.yml"
     limit=$(get_limit "c")
 else
-    playbook="network_edge_cleanup.yml"
     limit=$(get_limit "${filter}")
 fi
 
 eval ansible-playbook -vv \
     "${playbook}" \
-    --inventory inventory.ini "${limit}"
+    --inventory inventory/default/inventory.ini "${limit}"