aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2017-11-16 14:05:42 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-21 15:46:29 +0000
commit33e1d84ffb71e283acc0b3f834066a0bc5837780 (patch)
treee733f7f52799204c6db841bba010cf8e245c042b /mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack
parentee21bd791dd74558254f2b4aaef15504c9d395ea (diff)
[baremetal] public gateway setup on prx nodes
- prx: add route for public traffic to public interface - prx: add route towards salt master through maas - remove dashboard class from proxy node (already implements horizon) - remove dashboard (and benchmark) class definitions (no longer used) - (temporary) backport Pharos change for adapter template JIRA: FUEL-305 Change-Id: Ia14a18ac0123c1134d8d99dc43da9a1f770001d0 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 07f4e0238646fcb77072769feb8a0b68df52caca)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml1
3 files changed, 0 insertions, 23 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
deleted file mode 100644
index 5ae972da9..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_benchmark
- - cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
deleted file mode 100644
index c60d7c46c..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_dashboard
- - cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 7cb1c10c2..a516803fa 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -9,7 +9,6 @@
classes:
- cluster.baremetal-mcp-ocata-common.openstack_proxy
- cluster.baremetal-mcp-ocata-odl-ha.infra
- - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
parameters:
nginx:
server: