From 56dd23d0744cc60a3a900356c590266ca23686d7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 9 Sep 2017 03:09:18 +0200 Subject: log.sh: Collect /var/log from cluster nodes Bring back parameter `-L`, which is already passed by releng deploy script. Since we need to enable file_recv on salt master, do so by adding a new class in , which will be inherited by all scenario reclass models. JIRA: FUEL-288 Change-Id: I9b649315984fb8580b63883d0e06c1e1efd11057 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml | 4 ++++ .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 1 + .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 1 + mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 1 + 4 files changed, 7 insertions(+) create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml new file mode 100644 index 000000000..b7f8985b7 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -0,0 +1,4 @@ +parameters: + salt: + master: + file_recv: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml index 63e58a24b..39edab299 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml @@ -11,6 +11,7 @@ classes: - system.reclass.storage.system.openstack_compute_multi - system.reclass.storage.system.openstack_gateway_single - system.reclass.storage.system.opendaylight_control_single +- cluster.virtual-mcp-ocata-common.infra.config - cluster.virtual-mcp-ocata-odl-router parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index 864c71daa..56cfa6ed9 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml @@ -10,6 +10,7 @@ classes: - system.mysql.client.single - system.reclass.storage.system.openstack_compute_multi - system.reclass.storage.system.openstack_gateway_single +- cluster.virtual-mcp-ocata-common.infra.config - cluster.virtual-mcp-ocata-ovs-dpdk parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml index 97730b1fd..1cfded091 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml @@ -10,6 +10,7 @@ classes: - system.mysql.client.single - system.reclass.storage.system.openstack_compute_multi - system.reclass.storage.system.openstack_gateway_single +- cluster.virtual-mcp-ocata-common.infra.config - cluster.virtual-mcp-ocata-ovs parameters: _param: -- cgit 1.2.3-korg