From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Tue, 27 Dec 2016 17:44:34 +0800 Subject: Yamllint test JIRA: COMPASS-516 Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef Signed-off-by: liyuenan --- .../ansible/roles/open-contrail/vars/Debian.yml | 48 ------------ .../ansible/roles/open-contrail/vars/RedHat.yml | 9 --- .../ansible/roles/open-contrail/vars/main.yml | 89 ---------------------- 3 files changed, 146 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/main.yml (limited to 'deploy/adapters/ansible/roles/open-contrail/vars') diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml b/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml deleted file mode 100755 index 845aa78c..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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 -############################################################################## ---- - -package: "contrail-install-packages_2.21-102-ubuntu-14-04juno_all.deb" - -common_package: - - contrail-setup - -kernel_package: - - linux-headers-3.13.0-40 - - linux-headers-3.13.0-40-generic - - linux-image-3.13.0-40-generic - - linux-image-extra-3.13.0-40-generic - -kernel_required: "3.13.0-40-generic" - -database_package: - - contrail-openstack-database - -config_package: - - contrail-openstack-config - -control_package: - - contrail-openstack-control - -collector_package: - - contrail-openstack-analytics - -webui_package: - - contrail-openstack-webui - -vrouter_package: - - contrail-vrouter-3.13.0-40-generic - -dkms_package: - - contrail-vrouter-dkms - -compute_package: - - contrail-vrouter-common - - contrail-nova-vif - diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml b/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml deleted file mode 100755 index d760b4e6..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml +++ /dev/null @@ -1,9 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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 -############################################################################## ---- diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml deleted file mode 100755 index 582e41e8..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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 -############################################################################## ---- -#package: "contrail-install-packages_2.21-102~juno_all.deb" # mv to {os}.yml -kernel_install: no -#ansible_ssh_user: "root" -#ansible_ssh_pass: "root" - -#contrail_keystone_address: "{{ internal_vip.ip }}" -contrail_keystone_address: "{{ public_vip.ip }}" -contrail_admin_user: "admin" -contrail_admin_password: "console" - -neutron_plugin: neutron_plugin_contrail.tar.gz -nova_plugin: nova_contrail_vif.tar.gz - - -# network infor adapter for compass -# contrail_address: "{{ internal_ip }}" -contrail_address: "{{ ip_settings[inventory_hostname]['br-prv']['ip'] }}" -#contrail_device: # compass openstack device -contrail_netmask: "255.255.255.0" -#contrail_gateway: "10.84.50.254" -contrail_gateway: -#contrail_mgmt_address: "172.27.113.91" - - - -########################################################### -### we make an independent NIC for OpenContrail vRouter ### -########################################################### -contrail_vhost_device: "{{ network_cfg['provider_net_mappings'][0]['interface'] }}" -contrail_vhost_address: "{{ ip_settings[inventory_hostname]['br-prv']['ip'] }}" -contrail_vhost_gateway: "{{ ip_settings[inventory_hostname]['br-prv']['gw'] }}" -contrail_vhost_netmask: "{{ ip_settings[inventory_hostname]['br-prv']['netmask'] }}" -########################################################### -########################################################### -########################################################### - - - - -contrail_keepalived: no -#contrail_haproxy_address: "10.0.0.22" # 10.0.0.80 -#contrail_haproxy_address: "{{ internal_vip.ip }}" -contrail_haproxy_address: "{{ public_vip.ip }}" -contrail_netmask: "255.255.255.0" -contrail_prefixlen: "24" -contrail_gateway: "10.0.0.1" - -contrail_router_asn: "64512" - -### Modify when need openstack provisioning -keystone_provision: no -install_nova: no -#rabbit_password: {{ RABBIT_PASS }} - -contrail_tor_agents: - - name: "test01" - address: "10.0.0.81" - ovs_protocol: "pssl" - ovs_port: "9991" - tunnel_address: "10.0.0.81" - http_server_port: "9011" - vendor_name: "Juniper" - product_name: "QFX5100" - tsn_names: [ "system002" ] - - name: "test02" - address: "10.0.0.82" - ovs_protocol: "pssl" - ovs_port: "9992" - tunnel_address: "10.0.0.82" - http_server_port: "9012" - vendor_name: "Juniper" - product_name: "QFX5100" - tsn_names: [ "system002" ] - - -# adapter for compass -kernel_package_noarch: [] - -compute_package_noarch: [] - -- cgit 1.2.3-korg