Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0
diff --git a/tcp_tests/fixtures/salt_fixtures.py b/tcp_tests/fixtures/salt_fixtures.py
index 3b9c52b..57fb656 100644
--- a/tcp_tests/fixtures/salt_fixtures.py
+++ b/tcp_tests/fixtures/salt_fixtures.py
@@ -68,6 +68,7 @@
# Create Salt cluster
if config.salt.salt_master_host == '0.0.0.0':
commands = utils.read_template(config.salt_deploy.salt_steps_path)
+ LOG.info("##################Executing command ####### {0}".format(commands))
salt_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.salt_deployed)
diff --git a/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml b/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
index 4e5e3db..722d321 100644
--- a/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
@@ -78,7 +78,7 @@
declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon");
echo -e "\nInstalling all required salt formulas\n";
apt-get install -y "${formula_services[@]/#/salt-formula-}";
- for formula_service in in "${formula_services[@]}"; do
+ for formula_service in "${formula_services[@]}"; do
echo -e "\nLink service metadata for formula ${formula_service} ...\n";
[ ! -L "/srv/salt/reclass/classes/service/${formula_service}" ] && ln -s ${FORMULA_PATH}/reclass/service/${formula_service} /srv/salt/reclass/classes/service/${formula_service};
done;
@@ -108,6 +108,14 @@
retry: {count: 1, delay: 1}
skip_fail: false
+- description: Configure salt adoptors on cfg01
+ cmd: |
+ ln -s /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py /usr/local/sbin/salt-reclass;
+ chmod +x /usr/lib/python2.7/dist-packages/reclass/adapters/salt.py
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 1}
+ skip_fail: false
+
- description: Restart services
cmd: |
systemctl restart salt-master;
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml b/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
index 8a8ddb2..a946d3b 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
@@ -3,7 +3,7 @@
default_interface_model:
- &interface_model !os_env INTERFACE_MODEL, virtio
-{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual_mcp10_ovs') + '.local' %}
+{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp10-ovs') + '.local' %}
{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}
diff --git a/tcp_tests/templates/virtual_mcp10_ovs.jinja b/tcp_tests/templates/virtual_mcp10_ovs.jinja
index 52a6985..424909f 100644
--- a/tcp_tests/templates/virtual_mcp10_ovs.jinja
+++ b/tcp_tests/templates/virtual_mcp10_ovs.jinja
@@ -1,2 +1,2 @@
-{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual_mcp10_ovs') + '.local' %}
+{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp10-ovs') + '.local' %}
{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}