aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-13 21:12:30 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-14 16:33:26 +0100
commit35041f05e790f8c13782eb4956b991a97fdec853 (patch)
tree2b10b224737cf909225b62283dfbf7dbc71ad8fe /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common
parent167e704d40bb40b1edf2e014444f0201a28178fa (diff)
[baremetal] Re-assign mgmt network to proxy nodes
- extend arch-specific list of predefined VM iface names (2 -> 3); - add extra vnet iface for prx0* VCP VMs, connected to br-ctl (mgmt); - add mgmt address to pod_config.yml template (and sample); - add mgmt address to reclass.storage prx nodes; JIRA: FUEL-302 Change-Id: I17ce65eade7f69219fc27264363364e3c47d8f3f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml9
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml8
4 files changed, 26 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
index a96e254df..3d3f8df62 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -65,6 +65,15 @@ parameters:
# yamllint disable-line rule:line-length
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+ reclass:
+ storage:
+ node:
+ openstack_proxy_node01:
+ params:
+ control_address: ${_param:openstack_proxy_node01_control_address}
+ openstack_proxy_node02:
+ params:
+ control_address: ${_param:openstack_proxy_node02_control_address}
linux:
system:
user:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index d098fa6df..004f72a41 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -121,12 +121,15 @@ parameters:
bridge: br-ctl
model: virtio
default_ext:
- eth1:
+ eth2:
bridge: br-mgmt
model: virtio
- eth0:
+ eth1:
bridge: br-ex
model: virtio
+ eth0:
+ bridge: br-ctl
+ model: virtio
glusterfs:
server:
volumes:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
index e638bca9f..49140f803 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
@@ -22,6 +22,8 @@ parameters:
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
+ openstack_proxy_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address}
+ openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address}
openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
@@ -201,12 +203,12 @@ parameters:
- ${_param:openstack_proxy_hostname}
- ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
prx01:
- address: ${_param:openstack_proxy_node01_address}
+ address: ${_param:openstack_proxy_node01_control_address}
names:
- ${_param:openstack_proxy_node01_hostname}
- ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
prx02:
- address: ${_param:openstack_proxy_node02_address}
+ address: ${_param:openstack_proxy_node02_control_address}
names:
- ${_param:openstack_proxy_node02_hostname}
- ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index a2d39854e..1d0e8d1c5 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -33,11 +33,19 @@ parameters:
salt_minion_ca_host: cfg01.${_param:cluster_domain}
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ control_nic: ${_param:opnfv_vcp_vm_tertiary_interface}
linux:
network:
interface:
dhcp: ${_param:linux_dhcp_interface}
single: ${_param:linux_single_interface}
+ control:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:control_nic}
+ address: ${_param:control_address}
+ netmask: 255.255.255.0
system:
package:
libapache2-mod-wsgi: