diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-25 04:36:02 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 00:40:22 +0000 |
commit | 53282e13c6c3937f5a3b9e91e72104252a38762f (patch) | |
tree | 09c49c53a35b06ace30e0ca46bb6a896a52032de /mcp/reclass/classes/cluster/virtual-mcp-ocata-common | |
parent | 91a3426ee125951d54d7e80ee8c133168221fcba (diff) |
Fix or silence all yamllint warnings
Change-Id: Iface28ab770beee00374afb902ef4f9c983538f5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 597e4b55f57001ead8e90f30e2e3211c7d705ca8)
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')
8 files changed, 214 insertions, 203 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml index f4ad1bfc2..63e506d9a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml @@ -1,3 +1,4 @@ +--- parameters: _param: haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 @@ -8,181 +9,181 @@ parameters: type: openstack-service service_name: cinder binds: - - address: ${_param:cluster_vip_address} - port: 8776 + - address: ${_param:cluster_vip_address} + port: 8776 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8776 + params: ${_param:haproxy_check} glance_api: type: openstack-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9292 + - address: ${_param:cluster_vip_address} + port: 9292 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9292 + params: ${_param:haproxy_check} glance_registry_api: type: general-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9191 + - address: ${_param:cluster_vip_address} + port: 9191 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9191 + params: ${_param:haproxy_check} glare: type: general-service service_name: glare binds: - - address: ${_param:cluster_vip_address} - port: 9494 + - address: ${_param:cluster_vip_address} + port: 9494 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9494 + params: ${_param:haproxy_check} heat_cloudwatch_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8003 + - address: ${_param:cluster_vip_address} + port: 8003 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8003 + params: ${_param:haproxy_check} heat_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8004 + - address: ${_param:cluster_vip_address} + port: 8004 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8004 + params: ${_param:haproxy_check} heat_cfn_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8000 + - address: ${_param:cluster_vip_address} + port: 8000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8000 + params: ${_param:haproxy_check} keystone_public_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 5000 + - address: ${_param:cluster_vip_address} + port: 5000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 5000 + params: ${_param:haproxy_check} keystone_admin_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 35357 + - address: ${_param:cluster_vip_address} + port: 35357 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 35357 + params: ${_param:haproxy_check} neutron_api: type: openstack-service service_name: neutron binds: - - address: ${_param:cluster_vip_address} - port: 9696 + - address: ${_param:cluster_vip_address} + port: 9696 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9696 + params: ${_param:haproxy_check} nova_placement_api: mode: http binds: - - address: ${_param:cluster_vip_address} - port: 8778 + - address: ${_param:cluster_vip_address} + port: 8778 options: - - httpclose - - httplog + - httpclose + - httplog health-check: http: options: - - expect status 401 + - expect status 401 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8778 + params: ${_param:haproxy_check} nova_ec2_api: type: general-service service_name: nova check: false binds: - - address: ${_param:cluster_vip_address} - port: 8773 + - address: ${_param:cluster_vip_address} + port: 8773 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8773 + params: ${_param:haproxy_check} nova_api: type: openstack-service service_name: nova binds: - - address: ${_param:cluster_vip_address} - port: 8774 + - address: ${_param:cluster_vip_address} + port: 8774 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8774 + params: ${_param:haproxy_check} nova_metadata_api: type: openstack-service binds: - - address: ${_param:cluster_vip_address} - port: 8775 + - address: ${_param:cluster_vip_address} + port: 8775 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8775 + params: ${_param:haproxy_check} ceilometer_api: type: general-service check: false binds: - - address: ${_param:cluster_vip_address} - port: 8777 + - address: ${_param:cluster_vip_address} + port: 8777 servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: ${_param:haproxy_check} + - name: ${_param:cluster_node01_hostname} + host: ${_param:cluster_node01_address} + port: 8777 + params: ${_param:haproxy_check} aodh-api: type: openstack-service service_name: aodh binds: - - address: ${_param:cluster_vip_address} - port: 8042 + - address: ${_param:cluster_vip_address} + port: 8042 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8042 + params: ${_param:haproxy_check} 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 index 73e2da5a9..07fada64d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -1,15 +1,16 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.salt.master.api -- system.salt.master.pkg -- system.reclass.storage.salt -- system.salt.minion.ca.salt_master -- system.salt.minion.cert.proxy -- system.mysql.client.single -- system.reclass.storage.system.openstack_compute_multi -- system.reclass.storage.system.openstack_gateway_single + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.salt.master.api + - system.salt.master.pkg + - system.reclass.storage.salt + - system.salt.minion.ca.salt_master + - system.salt.minion.cert.proxy + - system.mysql.client.single + - system.reclass.storage.system.openstack_compute_multi + - system.reclass.storage.system.openstack_gateway_single parameters: _param: openstack_control_node01_hostname: ctl01 @@ -20,6 +21,7 @@ parameters: salt_master_host: 127.0.0.1 salt_master_base_environment: prd salt_minion_ca_host: ${linux:network:fqdn} + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" linux: network: @@ -43,7 +45,7 @@ parameters: name: ${_param:openstack_control_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.control + - cluster.${_param:cluster_name}.openstack.control params: linux_system_codename: xenial salt_master_host: ${_param:reclass_config_master} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml index 9140bd0bc..e027e5b12 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml @@ -1,3 +1,4 @@ +--- parameters: linux: network: @@ -5,10 +6,10 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - cfg - - cfg.${_param:cluster_domain} + - cfg + - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml index 53e312787..18f8571a3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml @@ -1,3 +1,4 @@ +--- parameters: _param: # infra service addresses @@ -9,6 +10,7 @@ parameters: openstack_control_node03_address: 172.16.10.103 openstack_database_address: ${_param:openstack_control_address} openstack_message_queue_address: ${_param:openstack_control_address} + # yamllint disable rule:line-length openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml index 99f517f8a..6bc5e77cb 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -1,16 +1,17 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- service.nfs.client -- system.nova.compute.single -- service.neutron.compute.single -- service.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- system.ceilometer.client.nova_compute -- system.ceilometer.client.cinder_volume + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - system.linux.storage.loopback + - service.nfs.client + - system.nova.compute.single + - service.neutron.compute.single + - service.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - system.ceilometer.client.nova_compute + - system.ceilometer.client.cinder_volume parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} @@ -86,4 +87,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:primary_interface} + - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml index 6ac8f6d62..4c9af8d55 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -1,44 +1,45 @@ +--- classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.nfs.server -- system.mongodb.server.single -- system.mongodb.server.database.ceilometer -- system.ceilometer.client -- system.ceilometer.client.neutron -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- system.keystone.server.single -- system.keystone.client.single -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.ceilometer -- system.keystone.client.service.aodh -- system.glance.control.single -- system.nova.control.single -- system.cinder.control.single -- system.cinder.control.backend.lvm -- system.heat.server.single -- service.mysql.server.single -- system.galera.server.database.cinder -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.ceilometer -- system.galera.server.database.aodh -- service.ceilometer.server.single -- system.aodh.server.single -- system.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api + - system.linux.system.lowmem + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - service.nfs.server + - system.mongodb.server.single + - system.mongodb.server.database.ceilometer + - system.ceilometer.client + - system.ceilometer.client.neutron + - system.memcached.server.single + - system.rabbitmq.server.single + - system.rabbitmq.server.vhost.openstack + - system.keystone.server.wsgi + - system.keystone.server.single + - system.keystone.client.single + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.ceilometer + - system.keystone.client.service.aodh + - system.glance.control.single + - system.nova.control.single + - system.cinder.control.single + - system.cinder.control.backend.lvm + - system.heat.server.single + - service.mysql.server.single + - system.galera.server.database.cinder + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.ceilometer + - system.galera.server.database.aodh + - service.ceilometer.server.single + - system.aodh.server.single + - system.horizon.server.single + - service.haproxy.proxy.single + - cluster.virtual-mcp-ocata-common.haproxy_openstack_api parameters: _param: linux_system_codename: xenial @@ -67,16 +68,16 @@ parameters: server: admin_email: ${_param:admin_email} pkgs: - - keystone - - python-keystone - - python-keystoneclient - - python-psycopg2 - - python-mysqldb - - python-six - - python-memcache - - python-openstackclient - - gettext-base - - python-pycadf + - keystone + - python-keystone + - python-keystoneclient + - python-psycopg2 + - python-mysqldb + - python-six + - python-memcache + - python-openstackclient + - gettext-base + - python-pycadf glance: server: storage: @@ -129,6 +130,6 @@ parameters: nova: host: ${_param:single_address}/24 params: - - rw - - no_root_squash - - async + - rw + - no_root_squash + - async diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml index f726c4af2..b0316f209 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml @@ -1,7 +1,8 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} @@ -53,7 +54,7 @@ parameters: netmask: 255.255.255.0 mtu: ${_param:interface_mtu} use_interfaces: - - ${_param:primary_interface} + - ${_param:primary_interface} float-to-ex: enabled: true type: ovs_port @@ -66,6 +67,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-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml index a14a7113a..8ac2391b7 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml @@ -1,3 +1,4 @@ +--- parameters: _param: openstack_version: ocata @@ -8,15 +9,15 @@ parameters: cluster_public_protocol: http cluster_public_host: 10.16.0.101 neutron_public_protocol: http - neutron_control_dvr: False - neutron_l3_ha: False + neutron_control_dvr: 'False' + neutron_l3_ha: 'False' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: False + neutron_compute_external_access: 'False' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -51,7 +52,6 @@ parameters: nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 neutron_version: ${_param:openstack_version} neutron_service_host: ${_param:cluster_local_address} - metadata_password: password mysql_admin_user: root mysql_admin_password: opnfv_secret mysql_cinder_password: opnfv_secret @@ -75,6 +75,7 @@ parameters: ceilometer_secret_key: opnfv_secret metadata_password: opnfv_secret horizon_version: ${_param:openstack_version} + # yamllint disable-line rule:line-length horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e horizon_identity_host: ${_param:cluster_vip_address} horizon_identity_encryption: none @@ -82,6 +83,7 @@ parameters: mongodb_server_replica_set: ceilometer mongodb_ceilometer_password: opnfv_secret mongodb_admin_password: opnfv_secret + # yamllint disable-line rule:line-length mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth aodh_version: ${_param:openstack_version} keystone_aodh_password: opnfv_secret @@ -98,25 +100,25 @@ parameters: ctl: address: ${_param:openstack_control_address} names: - - ctl - - ctl.${_param:cluster_domain} + - ctl + - ctl.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ctl01 - - ctl01.${_param:cluster_domain} + - ctl01 + - ctl01.${_param:cluster_domain} gtw01: address: ${_param:openstack_gateway_address} names: - - gtw01 - - gtw01.${_param:cluster_domain} + - gtw01 + - gtw01.${_param:cluster_domain} cmp01: address: 172.16.10.105 names: - - cmp01 - - cmp01.${_param:cluster_domain} + - cmp01 + - cmp01.${_param:cluster_domain} cmp02: address: 172.16.10.106 names: - - cmp02 - - cmp02.${_param:cluster_domain} + - cmp02 + - cmp02.${_param:cluster_domain} |