| commit | 3fe24dd31a6aacd4a9c3715ee5d6d8eb68e80737 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Jul 20 18:38:57 2018 +0300 |
| committer | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Jul 20 20:19:26 2018 +0300 |
| tree | 9b23265bda49a31087e0f9f326baa4b6b97a68ac | |
| parent | a4dff8633340fee499d25efa2ceadc98324bad78 [diff] |
Use $(hostname -s) to generate minion ID instead of VM name Change-Id: I705172304ca8a7e99186ac48368fcc208084d484
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml index addd74d..a346860 100644 --- a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml +++ b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -128,7 +128,6 @@ kubernetes_externaldns_enabled: 'False' kubernetes_keepalived_vip_interface: ens4 kubernetes_network_calico_enabled: 'True' - kubernetes_virtlet_enabled: 'False' local_repositories: 'False' maas_deploy_address: 10.167.5.15 maas_deploy_range_end: 10.167.5.199
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml index b63b82d..25bcbc4 100644 --- a/tcp_tests/templates/shared-salt.yaml +++ b/tcp_tests/templates/shared-salt.yaml
@@ -645,8 +645,8 @@ - description: Configure salt-minion on {{ ssh['node_name'] }} cmd: | [ ! -d /etc/salt/minion.d ] && mkdir -p /etc/salt/minion.d; - cat << "EOF" > /etc/salt/minion.d/minion.conf - id: {{ ssh['node_name'] }} + cat << EOF > /etc/salt/minion.d/minion.conf + id: $(hostname -s).{{ DOMAIN_NAME }} master: {{ config.salt.salt_master_host }} EOF