From 597e4b55f57001ead8e90f30e2e3211c7d705ca8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 25 Sep 2017 04:36:02 +0200 Subject: Fix or silence all yamllint warnings Change-Id: Iface28ab770beee00374afb902ef4f9c983538f5 Signed-off-by: Alexandru Avadanii --- .../virtual-mcp-ocata-odl-router/infra/config.yml | 9 ++++--- .../cluster/virtual-mcp-ocata-odl-router/init.yml | 11 ++++---- .../opendaylight/control.yml | 11 ++++---- .../openstack/compute.yml | 11 ++++---- .../openstack/control.yml | 31 +++++++++++----------- .../openstack/gateway.yml | 13 ++++----- .../openstack/init.yml | 8 +++--- 7 files changed, 51 insertions(+), 43 deletions(-) (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router') 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 c66ba2a9c..f8d80ed2c 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 @@ -1,14 +1,15 @@ +--- classes: -- system.reclass.storage.system.opendaylight_control_single -- cluster.virtual-mcp-ocata-common.infra.config -- cluster.virtual-mcp-ocata-odl-router + - system.reclass.storage.system.opendaylight_control_single + - cluster.virtual-mcp-ocata-common.infra.config + - cluster.virtual-mcp-ocata-odl-router parameters: reclass: storage: node: opendaylight_control_node01: classes: - - cluster.${_param:cluster_name}.opendaylight.control + - cluster.${_param:cluster_name}.opendaylight.control params: linux_system_codename: xenial single_address: ${_param:opendaylight_service_host} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml index 20d6d18d3..1f86ba534 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.virtual-mcp-ocata-common.init_options -- cluster.virtual-mcp-ocata-common.infra -- cluster.virtual-mcp-ocata-odl-router.openstack + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.virtual-mcp-ocata-common.init_options + - cluster.virtual-mcp-ocata-common.infra + - cluster.virtual-mcp-ocata-odl-router.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml index 8f83ddee8..d47e5cc3d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml @@ -1,9 +1,10 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.opendaylight.server.single -- cluster.virtual-mcp-ocata-odl-router + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - system.opendaylight.server.single + - cluster.virtual-mcp-ocata-odl-router parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml index 5cfcd8d05..038df5c06 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml @@ -1,6 +1,7 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_compute -- cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-ocata-common.openstack_compute + - cluster.virtual-mcp-ocata-odl-router parameters: opendaylight: client: @@ -26,7 +27,7 @@ parameters: netmask: 255.255.255.0 gateway: 10.1.0.110 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} br-floating: enabled: true type: ovs_bridge @@ -43,6 +44,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_interface} + - ${_param:external_interface} use_ovs_ports: - - float-to-ex + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml index 729b2f903..19083e5ff 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml @@ -1,7 +1,8 @@ +--- classes: -- system.neutron.control.opendaylight.single -- cluster.virtual-mcp-ocata-common.openstack_control -- cluster.virtual-mcp-ocata-odl-router + - system.neutron.control.opendaylight.single + - cluster.virtual-mcp-ocata-common.openstack_control + - cluster.virtual-mcp-ocata-odl-router parameters: neutron: server: @@ -14,21 +15,21 @@ parameters: type: general-service service_name: opendaylight binds: - - address: ${_param:cluster_vip_address} - port: 8181 + - address: ${_param:cluster_vip_address} + port: 8181 servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8181 - params: ${_param:haproxy_check} + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8181 + params: ${_param:haproxy_check} opendaylight-rest: type: general-service service_name: opendaylight binds: - - address: ${_param:cluster_vip_address} - port: 8282 + - address: ${_param:cluster_vip_address} + port: 8282 servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8282 - params: ${_param:haproxy_check} + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8282 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml index 8e5672f63..9cacab73b 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml @@ -1,12 +1,13 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_gateway -- system.neutron.gateway.opendaylight.single -- cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-ocata-common.openstack_gateway + - system.neutron.gateway.opendaylight.single + - cluster.virtual-mcp-ocata-odl-router parameters: _param: neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent + - neutron-dhcp-agent + - neutron-metadata-agent neutron: gateway: pkgs: ${_param:neutron_agents} @@ -30,4 +31,4 @@ parameters: address: ${_param:tenant_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml index af01e01b4..ed03eb43d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" @@ -8,6 +9,7 @@ parameters: system: repo: uca: + # yamllint disable-line rule:line-length source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" architectures: amd64 key_id: EC4926EA @@ -17,5 +19,5 @@ parameters: odl01: address: 172.16.10.111 names: - - odl01 - - odl01.${_param:cluster_domain} + - odl01 + - odl01.${_param:cluster_domain} -- cgit 1.2.3-korg