summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-04 22:33:53 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-14 22:59:35 +0100
commit2fc4b8890ef1ad456ac1ff421f33e005ae0484be (patch)
treea5ad052a2c9ec3a93d84d767d2b2fa7ff01dce85 /mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha
parent9eb05da8bc5618e4b95d396fcc932a7c0abb3bd6 (diff)
[baremetal] Move VCP iface config to own yml
- move linux.network.interface definitions to their own classes, which also removes the previous requirement of defining {dhcp,single}_nic parameters in classes that don't actually use them; - drop now useless {dhcp,single}_nic parameters; - expand linux_{dhcp,single}_interface macros, since they cause issues with reclass dict-merge while attempting to override sub-vars (i.e. it's not possible to set 'enabled: false' via reclass interpolation); JIRA: FUEL-310 Change-Id: I29d921f545e761de335a60e242a4523d13b06c78 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml1
6 files changed, 6 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml
index 3bb4266ea..50eb342e5 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml
@@ -8,16 +8,11 @@
---
classes:
- system.opendaylight.server.single
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-pike-odl-ha
parameters:
_param:
linux_system_codename: xenial
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- single: ${_param:linux_single_interface}
opendaylight:
server:
odl_bind_ip: ${_param:single_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml
index fd89a4fc2..2cbb8cae9 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml
@@ -8,6 +8,7 @@
---
classes:
- system.neutron.control.opendaylight.cluster
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-pike-common-ha.openstack_control
- cluster.baremetal-mcp-pike-odl-ha.infra
parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml
index 18cc777a5..8585c6915 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-pike-common-ha.openstack_database
- cluster.baremetal-mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml
index ad0836577..dfe1e28ca 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-pike-common-ha.openstack_message_queue
- cluster.baremetal-mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml
index 1b329354a..023ffd484 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_triport
- cluster.baremetal-mcp-pike-common-ha.openstack_proxy
- cluster.baremetal-mcp-pike-odl-ha.infra
parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml
index 0eed90823..83d1be89a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml
@@ -7,5 +7,6 @@
##############################################################################
---
classes:
+ - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
- cluster.baremetal-mcp-pike-common-ha.openstack_telemetry
- cluster.baremetal-mcp-pike-odl-ha.infra