From 89522c6507638be1fea87869382820865cd05595 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 18 May 2016 18:12:32 +0300 Subject: [PATCH] Update tasks fixtures for LCM idempotency tests Change-Id: I461bd5a8ecafb9699283ffd6bf8dcfe40ed0ec70 Closes-Bug: #1582715 (cherry picked from commit fdfbb493331110f4940998df0f02bd508baf9a2b) --- .../1_ctrl_1_cmp_1_cinder/cinder.yaml | 13 ++++++---- .../1_ctrl_1_cmp_1_cinder/compute.yaml | 17 +++++++------ .../1_ctrl_1_cmp_1_cinder/controller.yaml | 24 +++++++++++------- .../1_ctrl_1_cmp_1_mongo/compute.yaml | 10 +++++--- .../1_ctrl_1_cmp_1_mongo/controller.yaml | 21 ++++++++++------ .../fixtures/1_ctrl_1_cmp_1_mongo/mongo.yaml | 11 +++++--- .../1_ctrl_1_cmp_3_ceph/ceph-osd.yaml | 13 ++++++---- .../fixtures/1_ctrl_1_cmp_3_ceph/compute.yaml | 15 ++++++----- .../1_ctrl_1_cmp_3_ceph/controller.yaml | 25 +++++++++++-------- 9 files changed, 91 insertions(+), 58 deletions(-) diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/cinder.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/cinder.yaml index e2cdfeb92..6e9154fbf 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/cinder.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/cinder.yaml @@ -4,8 +4,7 @@ tasks: - update_hosts: null - clear_nodes_info: type: skipped - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - tools: null @@ -17,12 +16,16 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - allocate_hugepages: null - - plugins_setup_repositories: null + - plugins_setup_repositories: + no_puppet_run: true - ssl-keys-saving: null + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null @@ -42,4 +45,4 @@ tasks: type: copy_files - ntp-client: null - ssl-add-trust-chain: null - - reserved_ports: null + - reserved_ports: null \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/compute.yaml index e715e90a0..d3c984327 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/compute.yaml @@ -8,8 +8,7 @@ tasks: - clear_nodes_info: type: skipped - openstack-network-agents-sriov: null - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - openstack-network-agents-l3: null @@ -23,12 +22,14 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - openstack-network-plugins-l2: null - allocate_hugepages: null - - plugins_setup_repositories: null + - plugins_setup_repositories: + no_puppet_run: true - ceph-compute: no_puppet_run: true - ssl-keys-saving: null @@ -37,8 +38,8 @@ tasks: - Exec[sriov_iommu_check] - openstack-network-end: type: skipped - - ceilometer-compute: - no_puppet_run: true + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null @@ -56,9 +57,11 @@ tasks: - connectivity_tests: null - configuration_symlink: type: shell + - ceilometer-compute: + no_puppet_run: true - hosts: null - copy_haproxy_keys: type: copy_files - ntp-client: null - ssl-add-trust-chain: null - - reserved_ports: null + - reserved_ports: null \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/controller.yaml index ed396b18a..4a9f21ba7 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/controller.yaml @@ -9,7 +9,8 @@ tasks: - rsync_core_puppet: type: sync - ssl-dns-setup: null - - ceilometer-controller: null + - ceilometer-controller: + no_puppet_run: true - override_configuration: null - ceilometer-keystone: no_puppet_run: true @@ -19,7 +20,8 @@ tasks: - radosgw-keystone: null - virtual_ips: null - primary-dns-server: null - - openstack-haproxy-murano: null + - openstack-haproxy-murano: + no_puppet_run: true - openstack-network-end: type: skipped - openstack-haproxy-radosgw: null @@ -58,7 +60,8 @@ tasks: - ntp-check: null - aodh-db: no_puppet_run: true - - disable_keystone_service_token: null + - disable_keystone_service_token: + no_puppet_run: true - umm: null - memcached: null - allocate_hugepages: null @@ -69,7 +72,8 @@ tasks: no_puppet_run: true - sahara-keystone: no_puppet_run: true - - openstack-haproxy-sahara: null + - openstack-haproxy-sahara: + no_puppet_run: true - ssl-keys-saving: null - primary-cluster: null - upload_cirros: @@ -88,13 +92,13 @@ tasks: - ironic-keystone: no_puppet_run: true - connectivity_tests: null - - swift-storage: null - primary-heat: null - conntrackd: null - sahara-db: no_puppet_run: true - horizon: null - - openstack-haproxy-ceilometer: null + - openstack-haproxy-ceilometer: + no_puppet_run: true - openstack-network-common-config: null - firewall: null - apache: null @@ -109,8 +113,8 @@ tasks: no_puppet_run: true - aodh: no_puppet_run: true - - ceph_create_pools: - no_puppet_run: true + - copy_deleted_nodes: + type: copy_files - openstack-haproxy-ironic: no_puppet_run: true - setup_repositories: null @@ -167,10 +171,13 @@ tasks: - ntp-server: null - murano-keystone: no_puppet_run: true + - swift-proxy_storage: null - primary-openstack-network-agents-dhcp: null - openstack-haproxy-heat: null - primary-openstack-controller: null - openstack-cinder: null + - ceph_create_pools: + no_puppet_run: true - keystone-db: skip: - File[/root/.my.cnf] @@ -181,6 +188,5 @@ tasks: - openstack-network-server-nova: null - copy_haproxy_keys: type: copy_files - - primary-swift-proxy: null - openstack-network-networks: null - ssl-add-trust-chain: null \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/compute.yaml index b528d9438..64063a8c9 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/compute.yaml @@ -8,8 +8,7 @@ tasks: - clear_nodes_info: type: skipped - openstack-network-agents-sriov: null - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - openstack-network-agents-l3: null @@ -23,7 +22,8 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - openstack-network-plugins-l2: null @@ -38,7 +38,8 @@ tasks: - Exec[sriov_iommu_check] - openstack-network-end: type: skipped - - ceilometer-compute: null + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null @@ -56,6 +57,7 @@ tasks: - connectivity_tests: null - configuration_symlink: type: shell + - ceilometer-compute: null - hosts: null - copy_haproxy_keys: type: copy_files diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/controller.yaml index 22ef829d0..8f8a2cbea 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/controller.yaml @@ -18,14 +18,16 @@ tasks: - radosgw-keystone: null - virtual_ips: null - primary-dns-server: null - - openstack-haproxy-murano: null + - openstack-haproxy-murano: + no_puppet_run: true - openstack-network-end: type: skipped - openstack-haproxy-radosgw: null - openstack-haproxy-swift: null - heat-db: null - openstack-haproxy-neutron: null - - updatedb: null + - updatedb: + no_puppet_run: true - ironic-db: no_puppet_run: true - plugins_rsync: @@ -55,7 +57,8 @@ tasks: no_puppet_run: true - ntp-check: null - aodh-db: null - - disable_keystone_service_token: null + - disable_keystone_service_token: + no_puppet_run: true - umm: null - memcached: null - allocate_hugepages: null @@ -66,7 +69,8 @@ tasks: no_puppet_run: true - sahara-keystone: no_puppet_run: true - - openstack-haproxy-sahara: null + - openstack-haproxy-sahara: + no_puppet_run: true - ssl-keys-saving: null - primary-cluster: null - upload_cirros: @@ -85,7 +89,6 @@ tasks: - ironic-keystone: no_puppet_run: true - connectivity_tests: null - - swift-storage: null - primary-heat: null - conntrackd: null - sahara-db: @@ -104,8 +107,8 @@ tasks: - murano-cfapi-keystone: no_puppet_run: true - aodh: null - - ceph_create_pools: - no_puppet_run: true + - copy_deleted_nodes: + type: copy_files - openstack-haproxy-ironic: no_puppet_run: true - setup_repositories: null @@ -162,10 +165,13 @@ tasks: - ntp-server: null - murano-keystone: no_puppet_run: true + - swift-proxy_storage: null - primary-openstack-network-agents-dhcp: null - openstack-haproxy-heat: null - primary-openstack-controller: null - openstack-cinder: null + - ceph_create_pools: + no_puppet_run: true - keystone-db: skip: - File[/root/.my.cnf] @@ -176,6 +182,5 @@ tasks: - openstack-network-server-nova: null - copy_haproxy_keys: type: copy_files - - primary-swift-proxy: null - openstack-network-networks: null - ssl-add-trust-chain: null diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/mongo.yaml index c40ecc738..eca85ed26 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/mongo.yaml @@ -5,8 +5,7 @@ tasks: - clear_nodes_info: type: skipped - top-role-primary-mongo: null - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - tools: null @@ -17,12 +16,16 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - allocate_hugepages: null - - plugins_setup_repositories: null + - plugins_setup_repositories: + no_puppet_run: true - ssl-keys-saving: null + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ceph-osd.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ceph-osd.yaml index 96d4374e3..18c4d7815 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ceph-osd.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ceph-osd.yaml @@ -4,8 +4,7 @@ tasks: - update_hosts: null - clear_nodes_info: type: skipped - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - tools: null @@ -16,12 +15,16 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - allocate_hugepages: null - - plugins_setup_repositories: null + - plugins_setup_repositories: + no_puppet_run: true - ssl-keys-saving: null + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null @@ -40,4 +43,4 @@ tasks: type: copy_files - ntp-client: null - ssl-add-trust-chain: null - - reserved_ports: null + - reserved_ports: null \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/compute.yaml index a4f1b5563..1bc0b57aa 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/compute.yaml @@ -8,8 +8,7 @@ tasks: - clear_nodes_info: type: skipped - openstack-network-agents-sriov: null - - copy_keys_ceph: - type: copy_files + - override_configuration: null - globals: null - fuel_pkgs: null - openstack-network-agents-l3: null @@ -23,12 +22,14 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: null + - copy_deleted_nodes: + type: copy_files - setup_repositories: null - dns-client: null - openstack-network-plugins-l2: null - allocate_hugepages: null - - plugins_setup_repositories: null + - plugins_setup_repositories: + no_puppet_run: true - ceph-compute: null - ssl-keys-saving: null - sriov_iommu_check: @@ -36,8 +37,8 @@ tasks: - Exec[sriov_iommu_check] - openstack-network-end: type: skipped - - ceilometer-compute: - no_puppet_run: true + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: null @@ -55,6 +56,8 @@ tasks: - connectivity_tests: null - configuration_symlink: type: shell + - ceilometer-compute: + no_puppet_run: true - hosts: null - copy_haproxy_keys: type: copy_files diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/controller.yaml index 25bc7f1c8..07c243c3f 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/controller.yaml @@ -9,7 +9,8 @@ tasks: - rsync_core_puppet: type: sync - ssl-dns-setup: null - - ceilometer-controller: null + - ceilometer-controller: + no_puppet_run: true - override_configuration: null - ceilometer-keystone: no_puppet_run: true @@ -19,7 +20,8 @@ tasks: - radosgw-keystone: null - virtual_ips: null - primary-dns-server: null - - openstack-haproxy-murano: null + - openstack-haproxy-murano: + no_puppet_run: true - openstack-network-end: type: skipped - openstack-haproxy-radosgw: null @@ -56,7 +58,8 @@ tasks: - ntp-check: null - aodh-db: no_puppet_run: true - - disable_keystone_service_token: null + - disable_keystone_service_token: + no_puppet_run: true - umm: null - memcached: null - allocate_hugepages: null @@ -67,7 +70,8 @@ tasks: no_puppet_run: true - sahara-keystone: no_puppet_run: true - - openstack-haproxy-sahara: null + - openstack-haproxy-sahara: + no_puppet_run: true - ssl-keys-saving: null - primary-cluster: null - upload_cirros: @@ -86,14 +90,13 @@ tasks: - ironic-keystone: no_puppet_run: true - connectivity_tests: null - - swift-storage: - no_puppet_run: true - primary-heat: null - conntrackd: null - sahara-db: no_puppet_run: true - horizon: null - - openstack-haproxy-ceilometer: null + - openstack-haproxy-ceilometer: + no_puppet_run: true - openstack-network-common-config: null - firewall: null - apache: null @@ -108,7 +111,8 @@ tasks: no_puppet_run: true - aodh: no_puppet_run: true - - ceph_create_pools: null + - copy_deleted_nodes: + type: copy_files - openstack-haproxy-ironic: no_puppet_run: true - setup_repositories: null @@ -167,10 +171,13 @@ tasks: - ntp-server: null - murano-keystone: no_puppet_run: true + - swift-proxy_storage: + no_puppet_run: true - primary-openstack-network-agents-dhcp: null - openstack-haproxy-heat: null - primary-openstack-controller: null - openstack-cinder: null + - ceph_create_pools: null - keystone-db: skip: - File[/root/.my.cnf] @@ -181,7 +188,5 @@ tasks: - openstack-network-server-nova: null - copy_haproxy_keys: type: copy_files - - primary-swift-proxy: - no_puppet_run: true - openstack-network-networks: null - ssl-add-trust-chain: null