noheat deployment: use nfs0 as nexus3 bastion

Bastion rules may cause DNS malfunction sometimes. It won't be an issue
on NFS server but might be on control or operator host.

Issue-ID: INT-1601
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
Change-Id: I23f49a20257c34475ed02f4c0df036f0ded450f4

diff --git a/deployment/noheat/cluster-rke/ansible/create.yml b/deployment/noheat/cluster-rke/ansible/create.yml
index 7304dbb..296bb95 100644 (file)
--- a/deployment/noheat/cluster-rke/ansible/create.yml
+++ b/deployment/noheat/cluster-rke/ansible/create.yml
@@ -5,7 +5,7 @@
   roles:
     - role: setup_nfs
 - name: Set up bastion node for ONAP Docker registry
-  hosts: "control0"
+  hosts: "nfs0"
   become: yes
   roles:
     - role: create_bastion
@@ -17,6 +17,6 @@
     - name: Add cluster hostnames to /etc/hosts file
       lineinfile:
         path: /etc/hosts
-        line: "{{ hostvars['control0']['ansible_default_ipv4']['address'] }} {{ item }}"
+        line: "{{ hostvars['nfs0']['ansible_default_ipv4']['address'] }} {{ item }}"
       loop:
         - "nexus3.onap.org"

diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
index fbfe432..cb5168c 100644 (file)
--- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
+++ b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
@@ -37,6 +37,7 @@ cluster:
       flavor: "m1.xlarge"
       keypair: *keypair_name
       network: *network_name
+      auto_ip: false
       securitygroup: *securitygroup_name
       volume_size: 50
     - name: "worker0a"
@@ -68,6 +69,5 @@ cluster:
       flavor: "m1.large"
       keypair: *keypair_name
       network: *network_name
-      auto_ip: false
       securitygroup: *securitygroup_name
       volume_size: 150