[CORD-2017]
Change mock and single scenario head node VM's from headnode to head1,
making more uniform with physical scenarios and muscle memory
Change-Id: Ia9fa0992235772fe881bd07d08ad6947be047ffe
diff --git a/scenarios/mock/Vagrantfile b/scenarios/mock/Vagrantfile
index 774c81e..f688ee9 100644
--- a/scenarios/mock/Vagrantfile
+++ b/scenarios/mock/Vagrantfile
@@ -16,8 +16,8 @@
config.vm.synced_folder "../../platform-install/credentials/", "/opt/credentials/", create: true
# set the headnode VM
- config.vm.define "headnode" do |d|
- d.vm.hostname = "headnode"
+ config.vm.define "head1" do |d|
+ d.vm.hostname = "head1"
d.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: '*'
d.vm.network "private_network",
ip: settings['head_vm_ip']
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index 03c6ef9..99f3d86 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -27,14 +27,8 @@
head_vm_cpu: 4
head_vm_ip: "192.168.46.100"
-vagrant_vms:
- - headnode
-
-buildnode: headnode
-headnode: headnode
-
physical_node_list:
- - name: headnode
+ - name: head1
ipv4_last_octet: 1
aliases:
- head
@@ -95,10 +89,10 @@
ansible_connection: local
build:
- headnode:
+ head1:
head:
- headnode:
+ head1:
compute:
diff --git a/scenarios/single/Vagrantfile b/scenarios/single/Vagrantfile
index 78a7d21..b8092c8 100644
--- a/scenarios/single/Vagrantfile
+++ b/scenarios/single/Vagrantfile
@@ -16,8 +16,8 @@
config.vm.synced_folder "../../platform-install/credentials/", "/opt/credentials/", create: true
# set the headnode VM
- config.vm.define "headnode" do |d|
- d.vm.hostname = "headnode"
+ config.vm.define "head1" do |d|
+ d.vm.hostname = "head1"
d.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: '*'
d.vm.network "private_network",
ip: settings['head_vm_ip']
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 11f3152..c6be80d 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -29,14 +29,8 @@
head_vm_cpu: 8
head_vm_ip: "192.168.46.100"
-vagrant_vms:
- - headnode
-
-buildnode: headnode
-headnode: headnode
-
physical_node_list:
- - name: headnode
+ - name: head1
ipv4_last_octet: 1
aliases:
- head
@@ -113,10 +107,10 @@
ansible_connection: local
build:
- headnode:
+ head1:
head:
- headnode:
+ head1:
compute: