summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-25 17:43:49 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-01 11:30:58 +0000
commitfd2100b6ec4685374b7704bc67f3a079e6bce57c (patch)
tree0cda7e64b523bb261cdecbc8dae7cd75ad449c32 /mcp/reclass
parent45737405947d6b0a66f777a3b8460fc7e8cc4cdd (diff)
Connect proxy nodes to public network
cloudify vnf requires public enpoints to be available from instance with manager, so connect nodes w/ nginx to routed public network. JIRA: FUEL-286 Change-Id: Id0caa699519b9b46dad51deac6955afe6a0050de Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 0861ea0799114d9c59499f2c52a9c7a79fb1bbb7)
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml9
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j29
2 files changed, 17 insertions, 1 deletions
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 757295a04..d098fa6df 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
@@ -78,7 +78,7 @@ parameters:
cpu: 2
ram: 2048
disk_profile: small
- net_profile: default
+ net_profile: default_ext
cluster:
internal:
node:
@@ -120,6 +120,13 @@ parameters:
eth0:
bridge: br-ctl
model: virtio
+ default_ext:
+ eth1:
+ bridge: br-mgmt
+ model: virtio
+ eth0:
+ bridge: br-ex
+ model: virtio
glusterfs:
server:
volumes:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
index 08abc36f2..d14f90582 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
@@ -88,3 +88,12 @@ parameters:
netmask: 255.255.255.0
use_interfaces:
- {{ nic_mgmt }}{% if vlan_mgmt and vlan_mgmt != 'native' %}.{{ vlan_mgmt }}{% endif %}
+ br-ex:
+ enabled: true
+ proto: manual
+ address: 0.0.0.0
+ netmask: 255.255.255.0
+ type: bridge
+ use_interfaces:
+ - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %}
+ noifupdown: true