diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cinder.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cinder.yaml index 962e8b95d..fae578cc5 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cinder.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cinder.yaml @@ -1,63 +1,65 @@ tasks: -- update_hosts: - resources: [] -- clear_nodes_info: - type: skipped -- copy_keys_ceph: - type: copy_files -- globals: - resources: [] -- fuel_pkgs: - resources: [] -- tools: - resources: [] -- enable_cinder_volume_service: - resources: [] -- rsync_core_puppet: - type: sync -- cgroups: - resources: [] -- upload_nodes_info: - type: skipped -- copy_keys: - type: copy_files -- override_configuration: - resources: [] -- setup_repositories: - resources: [] -- dns-client: - resources: [] -- allocate_hugepages: - resources: [] -- plugins_setup_repositories: - no_puppet_run: true -- ssl-keys-saving: - no_puppet_run: true -- upload_configuration: - type: upload_file -- firewall: - resources: [] -- top-role-cinder: - resources: - - Service[cinder-volume] -- logging: - resources: [] -- sync_time: - type: shell -- plugins_rsync: - resources: - - Exec[sync_time_shell] -- connectivity_tests: - resources: [] -- configuration_symlink: - type: shell -- hosts: - resources: [] -- copy_haproxy_keys: - type: copy_files -- ntp-client: - resources: [] -- ssl-add-trust-chain: - no_puppet_run: true -- reserved_ports: - resources: [] \ No newline at end of file + - update_hosts: + resources: [] + - clear_nodes_info: + type: skipped + - override_configuration: + resources: [] + - globals: + resources: [] + - fuel_pkgs: + resources: [] + - tools: + resources: [] + - enable_cinder_volume_service: + resources: [] + - rsync_core_puppet: + type: sync + - cgroups: + resources: [] + - upload_nodes_info: + type: skipped + - copy_keys: + type: copy_files + - copy_deleted_nodes: + type: copy_files + - setup_repositories: + resources: [] + - dns-client: + resources: [] + - allocate_hugepages: + no_puppet_run: true + - plugins_setup_repositories: + no_puppet_run: true + - ssl-keys-saving: + no_puppet_run: true + - copy_keys_ceph: + type: copy_files + - upload_configuration: + type: upload_file + - firewall: + resources: [] + - top-role-cinder: + resources: + - Service[cinder-volume] + - logging: + resources: [] + - sync_time: + type: shell + - plugins_rsync: + resources: + - Exec[sync_time_shell] + - connectivity_tests: + resources: [] + - configuration_symlink: + type: shell + - hosts: + resources: [] + - copy_haproxy_keys: + type: copy_files + - ntp-client: + resources: [] + - ssl-add-trust-chain: + no_puppet_run: true + - reserved_ports: + resources: [] \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml index 9ee7735a7..fcae424e2 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/cluster_settings.yaml @@ -30,9 +30,6 @@ additional_components: murano-cfapi: type: checkbox value: false - murano_glance_artifacts_plugin: - type: checkbox - value: false sahara: type: checkbox value: false @@ -104,6 +101,9 @@ murano_settings: murano_repo_url: type: text value: http://storage.apps.openstack.org/ + murano_glance_artifacts_plugin: + type: checkbox + value: false neutron_advanced_configuration: neutron_dvr: type: checkbox @@ -401,7 +401,7 @@ storage: value: false volumes_lvm: type: checkbox - value: false + value: true syslog: syslog_port: type: text diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/compute.yaml index b29497f24..23f8f40d0 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/compute.yaml @@ -1,89 +1,93 @@ tasks: -- update_hosts: - resources: [] -- openstack-network-start: - type: skipped -- openstack-network-common-config: - resources: [] -- clear_nodes_info: - type: skipped -- openstack-network-agents-sriov: - resources: [] -- copy_keys_ceph: - type: copy_files -- globals: - resources: [] -- fuel_pkgs: - resources: [] -- openstack-network-agents-l3: - resources: [] -- openstack-network-agents-metadata: - resources: [] -- tools: - resources: [] -- rsync_core_puppet: - type: sync -- enable_nova_compute_service: - resources: [] -- cgroups: - resources: [] -- upload_nodes_info: - type: skipped -- copy_keys: - type: copy_files -- override_configuration: - resources: [] -- setup_repositories: - resources: [] -- dns-client: - resources: [] -- openstack-network-plugins-l2: - resources: [] -- allocate_hugepages: - resources: [] -- plugins_setup_repositories: - no_puppet_run: true -- ceph-compute: - no_puppet_run: true -- ssl-keys-saving: - no_puppet_run: true -- sriov_iommu_check: - resources: - - Exec[sriov_iommu_check] -- openstack-network-end: - type: skipped -- ceilometer-compute: - no_puppet_run: true -- upload_configuration: - type: upload_file -- firewall: - resources: [] -- logging: - resources: [] -- top-role-compute: - resources: - - Notify[Module openstack_tasks cannot notify service nova-compute on packages - update] - - Nova_config[DEFAULT/resume_guests_state_on_host_boot] - - Nova_config[vnc/novncproxy_base_url] - - Service[nova-compute] -- sync_time: - type: shell -- openstack-network-compute-nova: - resources: [] -- plugins_rsync: - no_puppet_run: true -- connectivity_tests: - resources: [] -- configuration_symlink: - type: shell -- hosts: - resources: [] -- copy_haproxy_keys: - type: copy_files -- ntp-client: - resources: [] -- ssl-add-trust-chain: - no_puppet_run: true -- reserved_ports: - resources: [] \ No newline at end of file + - update_hosts: + resources: [] + - openstack-network-start: + type: skipped + - openstack-network-common-config: + resources: [] + - clear_nodes_info: + type: skipped + - openstack-network-agents-sriov: + resources: [] + - override_configuration: + resources: [] + - globals: + resources: [] + - fuel_pkgs: + resources: [] + - openstack-network-agents-l3: + resources: [] + - openstack-network-agents-metadata: + resources: [] + - tools: + resources: [] + - rsync_core_puppet: + type: sync + - enable_nova_compute_service: + resources: [] + - cgroups: + resources: [] + - upload_nodes_info: + type: skipped + - copy_keys: + type: copy_files + - copy_deleted_nodes: + type: copy_files + - setup_repositories: + resources: [] + - dns-client: + resources: [] + - openstack-network-plugins-l2: + resources: [] + - allocate_hugepages: + no_puppet_run: true + - plugins_setup_repositories: + no_puppet_run: true + - ceph-compute: + no_puppet_run: true + - ssl-keys-saving: + no_puppet_run: true + - sriov_iommu_check: + resources: + - Exec[sriov_iommu_check] + - openstack-network-end: + type: skipped + - copy_keys_ceph: + type: copy_files + - upload_configuration: + type: upload_file + - firewall: + resources: [] + - logging: + resources: [] + - top-role-compute: + resources: + - Notify[Module openstack_tasks cannot notify service nova-compute on packages + update] + - Nova_config[DEFAULT/resume_guests_state_on_host_boot] + - Nova_config[vnc/novncproxy_base_url] + - Nova_config[DEFAULT/vcpu_pin_set] + - Service[nova-compute] + - sync_time: + type: shell + - openstack-network-compute-nova: + resources: [] + - plugins_rsync: + no_puppet_run: true + - connectivity_tests: + resources: [] + - configuration_symlink: + type: shell + - ceilometer-compute: + resources: + - Exec[configuration_symlink_shell] + - hosts: + resources: [] + - copy_haproxy_keys: + type: copy_files + - ntp-client: + resources: [] + - ssl-add-trust-chain: + no_puppet_run: true + - reserved_ports: + resources: [] \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml index 4767f00c2..1738caab6 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/controller.yaml @@ -1,326 +1,329 @@ tasks: -- ironic_post_swift_key: - type: shell -- openstack-haproxy-mysqld: - resources: [] -- cinder-db: - resources: [] -- dump_rabbitmq_definitions: - resources: [] -- rsync_core_puppet: - type: sync -- ssl-dns-setup: - resources: - - Exec[rsync_core_puppet_shell] -- ceilometer-controller: - no_puppet_run: true -- override_configuration: - resources: [] -- ceilometer-keystone: - no_puppet_run: true -- nova-db: - resources: [] -- workloads_collector_add: - resources: [] -- primary-openstack-network-plugins-l2: - resources: [] -- radosgw-keystone: - resources: [] -- virtual_ips: - resources: [] -- primary-dns-server: - resources: [] -- openstack-haproxy-murano: - resources: [] -- openstack-network-end: - type: skipped -- openstack-haproxy-radosgw: - resources: [] -- openstack-haproxy-swift: - resources: [] -- heat-db: - resources: [] -- openstack-haproxy-neutron: - resources: [] -- updatedb: - no_puppet_run: true -- ironic-db: - no_puppet_run: true -- plugins_rsync: - no_puppet_run: true -- ceilometer-radosgw-user: - no_puppet_run: true -- openstack-haproxy-keystone: - resources: [] -- hosts: - resources: [] -- primary-rabbitmq: - resources: [] -- primary-cluster-haproxy: - resources: [] -- openstack-network-routers: - resources: [] -- reserved_ports: - resources: [] -- controller_remaining_tasks: - resources: [] -- glance-keystone: - resources: [] -- openstack-haproxy-aodh: - resources: [] -- murano-cfapi: - no_puppet_run: true -- vmware-vcenter: - no_puppet_run: true -- ironic-compute: - no_puppet_run: true -- primary-openstack-network-agents-metadata: - resources: [] -- cinder-keystone: - resources: [] -- copy_keys: - type: copy_files -- enable_rados: - no_puppet_run: true -- ntp-check: - resources: [] -- aodh-db: - no_puppet_run: true -- disable_keystone_service_token: - resources: [] -- umm: - resources: [] -- memcached: - resources: [] -- allocate_hugepages: - resources: [] -- openrc-delete: - resources: - - File[/root/openrc] -- plugins_setup_repositories: - no_puppet_run: true -- sahara-keystone: - no_puppet_run: true -- openstack-haproxy-sahara: - resources: [] -- ssl-keys-saving: - no_puppet_run: true -- primary-cluster: - resources: [] -- upload_cirros: - type: shell -- primary-keystone: - resources: - - File[/root/openrc] -- primary-openstack-network-agents-l3: - resources: [] -- upload_configuration: - type: upload_file -- create-cinder-types: - resources: [] -- neutron-keystone: - resources: - - Keystone_endpoint[RegionOne/neutron::network] -- logging: - resources: [] -- nova-keystone: - resources: - - Keystone_endpoint[RegionOne/nova::compute] - - Keystone_endpoint[RegionOne/novav3::computev3] -- update_hosts: - resources: [] -- ironic-keystone: - no_puppet_run: true -- connectivity_tests: - resources: [] -- swift-storage: - resources: [] -- primary-heat: - resources: - - Heat_config[keystone_authtoken/auth_uri] -- conntrackd: - resources: [] -- sahara-db: - no_puppet_run: true -- horizon: - resources: - - File[/var/lib/puppet/concat/_etc_openstack-dashboard_local_settings.py/fragments/50_local_settings.py] - - File[/etc/openstack-dashboard/local_settings.py] - - Exec[concat_/etc/openstack-dashboard/local_settings.py] -- openstack-haproxy-ceilometer: - resources: [] -- openstack-network-common-config: - resources: [] -- firewall: - resources: [] -- apache: - resources: [] -- globals: - resources: - - File[/etc/hiera/globals.yaml] -- aodh-keystone: - no_puppet_run: true -- glance: - resources: - - Glance_glare_config[DEFAULT/default_log_levels] - - Glance_registry_config[DEFAULT/default_log_levels] - - Glance_api_config[DEFAULT/default_log_levels] - - Glance_cache_config[DEFAULT/debug] - - Glance_api_config[DEFAULT/debug] - - Glance_glare_config[DEFAULT/debug] - - Glance_registry_config[DEFAULT/debug] -- tools: - resources: [] -- openstack-haproxy: - resources: [] -- cgroups: - resources: [] -- murano-cfapi-keystone: - no_puppet_run: true -- aodh: - no_puppet_run: true -- ceph_create_pools: - no_puppet_run: true -- openstack-haproxy-ironic: - no_puppet_run: true -- setup_repositories: - resources: [] -- openstack-network-routers-ha: - no_puppet_run: true -- glance-db: - resources: [] -- neutron-db: - resources: [] -- ironic_upload_images: - type: shell -- swift-rebalance-cron: - resources: [] -- primary-ceph-mon: - resources: [] -- openstack-haproxy-stats: - resources: [] -- ironic-api: - no_puppet_run: true -- primary-ceph-radosgw: - resources: [] -- dns-client: - resources: [] -- cluster-vrouter: - resources: [] -- murano-rabbitmq: - no_puppet_run: true -- api-proxy: - resources: [] -- cluster_health: - resources: [] -- heat-keystone: - resources: - - Keystone_endpoint[RegionOne/heat-cfn::cloudformation] - - Keystone_endpoint[RegionOne/heat::orchestration] -- openstack-haproxy-horizon: - resources: - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_015-horizon.cfg/fragments/00_horizon_listen_block] - - File[/etc/haproxy/conf.d/015-horizon.cfg] - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_015-horizon.cfg/fragments/01-horizon_horizon_balancermember_horizon] - - Exec[concat_/etc/haproxy/conf.d/015-horizon.cfg] -- openstack-network-start: - type: skipped -- clear_nodes_info: - type: skipped -- murano-db: - resources: - - Exec[clear_nodes_info_shell] -- copy_keys_ceph: - type: copy_files -- sahara: - no_puppet_run: true -- fuel_pkgs: - resources: [] -- swift-keystone: - resources: - - Keystone_endpoint[RegionOne/swift::object-store] - - Keystone_endpoint[RegionOne/swift_s3::s3] -- public_vip_ping: - resources: [] -- upload_nodes_info: - type: skipped -- openstack-haproxy-glance: - resources: - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_080-glance-api.cfg/fragments/00_glance-api_listen_block] - - Exec[concat_/etc/haproxy/conf.d/080-glance-api.cfg] - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_081-glance-glare.cfg/fragments/00_glance-glare_listen_block] - - File[/etc/haproxy/conf.d/080-glance-api.cfg] - - Exec[concat_/etc/haproxy/conf.d/081-glance-glare.cfg] - - File[/etc/haproxy/conf.d/081-glance-glare.cfg] -- murano: - no_puppet_run: true -- ceph_ready_check: - type: shell -- enable_quorum: - type: shell -- openstack-haproxy-nova: - resources: - - File[/etc/haproxy/conf.d/040-nova-api.cfg] - - File[/etc/haproxy/conf.d/170-nova-novncproxy.cfg] - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_040-nova-api.cfg/fragments/00_nova-api_listen_block] - - Exec[concat_/etc/haproxy/conf.d/040-nova-api.cfg] - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_170-nova-novncproxy.cfg/fragments/00_nova-novncproxy_listen_block] - - Exec[concat_/etc/haproxy/conf.d/170-nova-novncproxy.cfg] -- openstack-network-server-config: - resources: [] -- primary-database: - resources: - - File[/root/.my.cnf] -- vcenter_compute_zones_create: - type: shell -- openstack-haproxy-cinder: - resources: - - File[/etc/haproxy/conf.d/070-cinder-api.cfg] - - Exec[concat_/etc/haproxy/conf.d/070-cinder-api.cfg] - - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_070-cinder-api.cfg/fragments/00_cinder-api_listen_block] -- ntp-server: - resources: [] -- murano-keystone: - no_puppet_run: true -- primary-openstack-network-agents-dhcp: - resources: - - Neutron_dhcp_agent_config[DEFAULT/debug] -- openstack-haproxy-heat: - resources: [] -- primary-openstack-controller: - resources: - - Nova_config[DEFAULT/quota_driver] - - Nova_config[DEFAULT/debug] - - Nova_config[DEFAULT/default_log_levels] -- openstack-cinder: - resources: - - Cinder_config[DEFAULT/scheduler_default_filters] - - Cinder_config[DEFAULT/default_log_levels] - - Cinder_config[DEFAULT/debug] -- keystone-db: - resources: - - File[/root/.my.cnf] -- sync_time: - type: shell -- configuration_symlink: - type: shell -- openstack-network-server-nova: - resources: [] -- copy_haproxy_keys: - type: copy_files -- primary-swift-proxy: - resources: - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_account_frag-account] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/00_swift_proxy] - - File[/etc/swift/proxy-server.conf] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_object_frag-object] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_server_frag-swift_server] - - Exec[concat_/etc/swift/proxy-server.conf] - - Exec[concat_/etc/rsyncd.conf] - - File[/etc/rsyncd.conf] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_container_frag-container] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_backups_frag-swift_backups] -- openstack-network-networks: - resources: [] -- ssl-add-trust-chain: - no_puppet_run: true \ No newline at end of file + - ironic_post_swift_key: + type: shell + - openstack-haproxy-mysqld: + resources: [] + - cinder-db: + resources: [] + - dump_rabbitmq_definitions: + skip: + - Dump_rabbitmq_definitions[/etc/rabbitmq/definitions.full] + resources: [] + - rsync_core_puppet: + type: sync + - ssl-dns-setup: + resources: + - Exec[rsync_core_puppet_shell] + - ceilometer-controller: + no_puppet_run: true + - override_configuration: + resources: [] + - ceilometer-keystone: + no_puppet_run: true + - nova-db: + resources: [] + - workloads_collector_add: + resources: [] + - primary-openstack-network-plugins-l2: + resources: [] + - radosgw-keystone: + resources: [] + - virtual_ips: + resources: [] + - primary-dns-server: + resources: [] + - openstack-haproxy-murano: + no_puppet_run: true + - openstack-network-end: + type: skipped + - openstack-haproxy-radosgw: + resources: [] + - openstack-haproxy-swift: + resources: [] + - heat-db: + resources: [] + - openstack-haproxy-neutron: + resources: [] + - updatedb: + no_puppet_run: true + - ironic-db: + no_puppet_run: true + - plugins_rsync: + no_puppet_run: true + - ceilometer-radosgw-user: + no_puppet_run: true + - openstack-haproxy-keystone: + resources: [] + - hosts: + resources: [] + - primary-rabbitmq: + resources: [] + - primary-cluster-haproxy: + resources: [] + - openstack-network-routers: + resources: [] + - reserved_ports: + resources: [] + - controller_remaining_tasks: + resources: [] + - glance-keystone: + resources: [] + - openstack-haproxy-aodh: + resources: [] + - murano-cfapi: + no_puppet_run: true + - vmware-vcenter: + no_puppet_run: true + - ironic-compute: + no_puppet_run: true + - primary-openstack-network-agents-metadata: + resources: [] + - cinder-keystone: + resources: [] + - copy_keys: + type: copy_files + - enable_rados: + no_puppet_run: true + - ntp-check: + resources: [] + - aodh-db: + no_puppet_run: true + - disable_keystone_service_token: + no_puppet_run: true + - umm: + resources: [] + - memcached: + resources: [] + - allocate_hugepages: + no_puppet_run: true + - openrc-delete: + resources: + - File[/root/openrc] + - plugins_setup_repositories: + no_puppet_run: true + - sahara-keystone: + no_puppet_run: true + - openstack-haproxy-sahara: + no_puppet_run: true + - ssl-keys-saving: + no_puppet_run: true + - primary-cluster: + resources: [] + - upload_cirros: + type: shell + - primary-keystone: + resources: + - File[/root/openrc] + - primary-openstack-network-agents-l3: + resources: [] + - upload_configuration: + type: upload_file + - create-cinder-types: + resources: [] + - neutron-keystone: + resources: + - Keystone_endpoint[RegionOne/neutron::network] + - logging: + resources: [] + - nova-keystone: + resources: + - Keystone_endpoint[RegionOne/nova::compute] + - Keystone_endpoint[RegionOne/compute_legacy::compute_legacy] + - update_hosts: + resources: [] + - ironic-keystone: + no_puppet_run: true + - connectivity_tests: + resources: [] + - primary-heat: + resources: + - Heat_config[DEFAULT/heat_waitcondition_server_url] + - Heat_config[DEFAULT/heat_metadata_server_url] + - Heat_config[keystone_authtoken/auth_uri] + - Heat_config[clients_heat/url] + - Heat_config[DEFAULT/heat_watch_server_url] + - conntrackd: + resources: [] + - sahara-db: + no_puppet_run: true + - horizon: + resources: + - File[/var/lib/puppet/concat/_etc_openstack-dashboard_local_settings.py/fragments/50_local_settings.py] + - File[/etc/openstack-dashboard/local_settings.py] + - Exec[concat_/etc/openstack-dashboard/local_settings.py] + - openstack-haproxy-ceilometer: + no_puppet_run: true + - openstack-network-common-config: + resources: [] + - firewall: + resources: [] + - apache: + resources: [] + - globals: + resources: + - File[/etc/hiera/globals.yaml] + - aodh-keystone: + no_puppet_run: true + - glance: + resources: + - Glance_glare_config[DEFAULT/default_log_levels] + - Glance_registry_config[DEFAULT/default_log_levels] + - Glance_api_config[DEFAULT/default_log_levels] + - Glance_cache_config[DEFAULT/debug] + - Glance_api_config[DEFAULT/debug] + - Glance_glare_config[DEFAULT/debug] + - Glance_registry_config[DEFAULT/debug] + - tools: + resources: [] + - openstack-haproxy: + resources: [] + - cgroups: + resources: [] + - murano-cfapi-keystone: + no_puppet_run: true + - aodh: + no_puppet_run: true + - copy_deleted_nodes: + type: copy_files + - openstack-haproxy-ironic: + no_puppet_run: true + - setup_repositories: + resources: [] + - openstack-network-routers-ha: + no_puppet_run: true + - upload_murano_package: + no_puppet_run: true + - glance-db: + resources: [] + - neutron-db: + resources: [] + - ironic_upload_images: + type: shell + - swift-rebalance-cron: + resources: [] + - primary-ceph-mon: + resources: [] + - openstack-haproxy-stats: + resources: [] + - ironic-api: + no_puppet_run: true + - primary-ceph-radosgw: + resources: [] + - dns-client: + resources: [] + - cluster-vrouter: + resources: [] + - murano-rabbitmq: + no_puppet_run: true + - api-proxy: + resources: [] + - cluster_health: + resources: [] + - heat-keystone: + resources: + - Keystone_endpoint[RegionOne/heat-cfn::cloudformation] + - Keystone_endpoint[RegionOne/heat::orchestration] + - openstack-haproxy-horizon: + resources: + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_015-horizon.cfg/fragments/00_horizon_listen_block] + - File[/etc/haproxy/conf.d/015-horizon.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_015-horizon.cfg/fragments/01-horizon_horizon_balancermember_horizon] + - Exec[concat_/etc/haproxy/conf.d/015-horizon.cfg] + - openstack-network-start: + type: skipped + - clear_nodes_info: + type: skipped + - murano-db: + no_puppet_run: true + - copy_keys_ceph: + type: copy_files + - sahara: + no_puppet_run: true + - fuel_pkgs: + resources: [] + - swift-keystone: + resources: + - Keystone_endpoint[RegionOne/swift::object-store] + - Keystone_endpoint[RegionOne/swift_s3::s3] + - public_vip_ping: + resources: [] + - upload_nodes_info: + type: skipped + - openstack-haproxy-glance: + resources: + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_080-glance-api.cfg/fragments/00_glance-api_listen_block] + - Exec[concat_/etc/haproxy/conf.d/080-glance-api.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_081-glance-glare.cfg/fragments/00_glance-glare_listen_block] + - File[/etc/haproxy/conf.d/080-glance-api.cfg] + - Exec[concat_/etc/haproxy/conf.d/081-glance-glare.cfg] + - File[/etc/haproxy/conf.d/081-glance-glare.cfg] + - murano: + no_puppet_run: true + - ceph_ready_check: + type: shell + - enable_quorum: + type: shell + - openstack-haproxy-nova: + resources: + - File[/etc/haproxy/conf.d/040-nova-api.cfg] + - File[/etc/haproxy/conf.d/170-nova-novncproxy.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_040-nova-api.cfg/fragments/00_nova-api_listen_block] + - Exec[concat_/etc/haproxy/conf.d/040-nova-api.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_170-nova-novncproxy.cfg/fragments/00_nova-novncproxy_listen_block] + - Exec[concat_/etc/haproxy/conf.d/170-nova-novncproxy.cfg] + - openstack-network-server-config: + resources: [] + - primary-database: + resources: + - File[mysql-config-file] + - File[/root/.my.cnf] + - vcenter_compute_zones_create: + type: shell + - openstack-haproxy-cinder: + resources: + - File[/etc/haproxy/conf.d/070-cinder-api.cfg] + - Exec[concat_/etc/haproxy/conf.d/070-cinder-api.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_070-cinder-api.cfg/fragments/00_cinder-api_listen_block] + - ntp-server: + resources: [] + - murano-keystone: + no_puppet_run: true + - swift-proxy_storage: + resources: + - Swift_container_sync_realms_config[realm1/cluster_name1] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/00_swift_proxy] + - File[/etc/swift/proxy-server.conf] + - Exec[concat_/etc/swift/proxy-server.conf] + - primary-openstack-network-agents-dhcp: + resources: + - Neutron_dhcp_agent_config[DEFAULT/debug] + - openstack-haproxy-heat: + no_puppet_run: true + - primary-openstack-controller: + resources: + - Nova_config[DEFAULT/quota_driver] + - Nova_config[DEFAULT/debug] + - Nova_config[DEFAULT/scheduler_default_filters] + - Nova_config[DEFAULT/default_log_levels] + - openstack-cinder: + resources: + - Cinder_config[DEFAULT/scheduler_default_filters] + - Cinder_config[DEFAULT/default_log_levels] + - Cinder_config[DEFAULT/debug] + - ceph_create_pools: + no_puppet_run: true + - keystone-db: + resources: + - File[/root/.my.cnf] + - sync_time: + type: shell + - configuration_symlink: + type: shell + - openstack-network-server-nova: + resources: [] + - copy_haproxy_keys: + type: copy_files + - openstack-network-networks: + resources: [] + - ssl-add-trust-chain: + no_puppet_run: true \ No newline at end of file diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/nodes_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/nodes_settings.yaml index 12acfee81..6903767cb 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/nodes_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_cinder/ensurability/nodes_settings.yaml @@ -2,7 +2,7 @@ controller: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -19,7 +19,7 @@ cinder: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -36,7 +36,7 @@ compute: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/compute.yaml index 7cc4c19cf..03092aaa0 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/compute.yaml @@ -71,8 +71,7 @@ tasks: - sync_time: type: shell - openstack-network-compute-nova: - resources: - - Exec[undefine_libvirt_default_network] + resources: [] - plugins_rsync: no_puppet_run: true - connectivity_tests: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml index 195ac8f61..77161f572 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/controller.yaml @@ -137,7 +137,11 @@ tasks: resources: [] - primary-heat: resources: + - Heat_config[DEFAULT/heat_waitcondition_server_url] + - Heat_config[DEFAULT/heat_metadata_server_url] - Heat_config[keystone_authtoken/auth_uri] + - Heat_config[clients_heat/url] + - Heat_config[DEFAULT/heat_watch_server_url] - conntrackd: resources: [] - sahara-db: @@ -207,6 +211,7 @@ tasks: - ironic-api: resources: - Ironic_config[DEFAULT/default_log_levels] + - Ironic_config[api/public_endpoint] - Ironic_config[DEFAULT/debug] - primary-ceph-radosgw: resources: [] @@ -291,6 +296,7 @@ tasks: no_puppet_run: true - swift-proxy_storage: resources: + - Swift_container_sync_realms_config[realm1/cluster_name1] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/00_swift_proxy] - File[/etc/swift/proxy-server.conf] - Exec[concat_/etc/swift/proxy-server.conf] @@ -302,19 +308,9 @@ tasks: - primary-openstack-controller: resources: - Nova_config[DEFAULT/quota_driver] - - Nova_config[database/max_retries] - Nova_config[DEFAULT/debug] - - Nova_config[database/max_pool_size] - - Nova_config[database/max_overflow] - - Nova_config[DEFAULT/notify_on_state_change] - - Nova_config[DEFAULT/notification_driver] - - Nova_config[cinder/catalog_info] - - Nova_config[database/idle_timeout] - Nova_config[DEFAULT/scheduler_default_filters] - - Nova_config[DEFAULT/allow_resize_to_same_host] - Nova_config[DEFAULT/default_log_levels] - - Nova_config[DEFAULT/use_stderr] - - Nova_config[glance/api_servers] - openstack-cinder: resources: - Cinder_config[DEFAULT/scheduler_default_filters] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/nodes_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/nodes_settings.yaml index dbf35145c..6f41d0fb5 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/nodes_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_ironic/ensurability/nodes_settings.yaml @@ -2,7 +2,7 @@ controller: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -19,7 +19,7 @@ ironic: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -36,7 +36,7 @@ compute: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml index 9ee7735a7..5805f756d 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/cluster_settings.yaml @@ -14,7 +14,7 @@ access: additional_components: ceilometer: type: checkbox - value: false + value: true heat: type: hidden value: false @@ -23,16 +23,13 @@ additional_components: value: false mongo: type: checkbox - value: false + value: true murano: type: checkbox value: false murano-cfapi: type: checkbox value: false - murano_glance_artifacts_plugin: - type: checkbox - value: false sahara: type: checkbox value: false @@ -104,6 +101,9 @@ murano_settings: murano_repo_url: type: text value: http://storage.apps.openstack.org/ + murano_glance_artifacts_plugin: + type: checkbox + value: false neutron_advanced_configuration: neutron_dvr: type: checkbox diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/nodes_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/nodes_settings.yaml index faacea06a..f33737646 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/nodes_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_1_mongo/ensurability/nodes_settings.yaml @@ -2,7 +2,7 @@ controller: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -19,7 +19,7 @@ mongo: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -36,7 +36,7 @@ compute: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/ceph-osd.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/ceph-osd.yaml index 8b9cb1659..f7d9c98f5 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/ceph-osd.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/ceph-osd.yaml @@ -3,8 +3,8 @@ tasks: resources: [] - clear_nodes_info: type: skipped - - copy_keys_ceph: - type: copy_files + - override_configuration: + resources: [] - globals: resources: [] - fuel_pkgs: @@ -19,18 +19,20 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: - resources: [] + - copy_deleted_nodes: + type: copy_files - setup_repositories: resources: [] - dns-client: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - plugins_setup_repositories: no_puppet_run: true - ssl-keys-saving: no_puppet_run: true + - copy_keys_ceph: + type: copy_files - upload_configuration: type: upload_file - firewall: @@ -40,7 +42,7 @@ tasks: - logging: resources: [] - updatedb: - no_puppet_run: true + resources: [] - sync_time: type: shell - plugins_rsync: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml index 10eeda0c6..cf1f5fe0c 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/cluster_settings.yaml @@ -30,9 +30,6 @@ additional_components: murano-cfapi: type: checkbox value: false - murano_glance_artifacts_plugin: - type: checkbox - value: false sahara: type: checkbox value: false @@ -104,6 +101,9 @@ murano_settings: murano_repo_url: type: text value: http://storage.apps.openstack.org/ + murano_glance_artifacts_plugin: + type: checkbox + value: false neutron_advanced_configuration: neutron_dvr: type: checkbox @@ -395,13 +395,13 @@ storage: value: AQDzghZXAAAAABAA8jY8KftsCK4l726rNdu/Zg== volumes_block_device: type: checkbox - value: true + value: false volumes_ceph: type: checkbox - value: false + value: true volumes_lvm: type: checkbox - value: true + value: false syslog: syslog_port: type: text diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/compute.yaml index 1b088197f..eac1e66b4 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/compute.yaml @@ -9,8 +9,8 @@ tasks: type: skipped - openstack-network-agents-sriov: resources: [] - - copy_keys_ceph: - type: copy_files + - override_configuration: + resources: [] - globals: resources: [] - fuel_pkgs: @@ -31,8 +31,8 @@ tasks: type: skipped - copy_keys: type: copy_files - - override_configuration: - resources: [] + - copy_deleted_nodes: + type: copy_files - setup_repositories: resources: [] - dns-client: @@ -40,11 +40,11 @@ tasks: - openstack-network-plugins-l2: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - plugins_setup_repositories: no_puppet_run: true - ceph-compute: - no_puppet_run: true + resources: [] - ssl-keys-saving: no_puppet_run: true - sriov_iommu_check: @@ -52,8 +52,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: @@ -66,6 +66,7 @@ tasks: update] - Nova_config[DEFAULT/resume_guests_state_on_host_boot] - Nova_config[vnc/novncproxy_base_url] + - Nova_config[DEFAULT/vcpu_pin_set] - Service[nova-compute] - sync_time: type: shell @@ -77,6 +78,9 @@ tasks: resources: [] - configuration_symlink: type: shell + - ceilometer-compute: + resources: + - Exec[configuration_symlink_shell] - hosts: resources: [] - copy_haproxy_keys: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml index 0b6118137..e03503da3 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/controller.yaml @@ -6,8 +6,9 @@ tasks: - cinder-db: resources: [] - dump_rabbitmq_definitions: - resources: + skip: - Dump_rabbitmq_definitions[/etc/rabbitmq/definitions.full] + resources: [] - rsync_core_puppet: type: sync - ssl-dns-setup: @@ -22,7 +23,8 @@ tasks: - nova-db: resources: [] - workloads_collector_add: - resources: [] + resources: + - Keystone_tenant[services] - primary-openstack-network-plugins-l2: resources: [] - radosgw-keystone: @@ -32,7 +34,7 @@ tasks: - primary-dns-server: resources: [] - openstack-haproxy-murano: - resources: [] + no_puppet_run: true - openstack-network-end: type: skipped - openstack-haproxy-radosgw: @@ -44,7 +46,7 @@ tasks: - openstack-haproxy-neutron: resources: [] - updatedb: - no_puppet_run: true + resources: [] - ironic-db: no_puppet_run: true - plugins_rsync: @@ -88,13 +90,13 @@ tasks: - aodh-db: no_puppet_run: true - disable_keystone_service_token: - resources: [] + no_puppet_run: true - umm: resources: [] - memcached: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - openrc-delete: resources: - File[/root/openrc] @@ -103,7 +105,7 @@ tasks: - sahara-keystone: no_puppet_run: true - openstack-haproxy-sahara: - resources: [] + no_puppet_run: true - ssl-keys-saving: no_puppet_run: true - primary-cluster: @@ -127,18 +129,20 @@ tasks: - nova-keystone: resources: - Keystone_endpoint[RegionOne/nova::compute] - - Keystone_endpoint[RegionOne/novav3::computev3] + - Keystone_endpoint[RegionOne/compute_legacy::compute_legacy] - update_hosts: resources: [] - ironic-keystone: no_puppet_run: true - connectivity_tests: resources: [] - - swift-storage: - resources: [] - primary-heat: resources: + - Heat_config[DEFAULT/heat_waitcondition_server_url] + - Heat_config[DEFAULT/heat_metadata_server_url] - Heat_config[keystone_authtoken/auth_uri] + - Heat_config[clients_heat/url] + - Heat_config[DEFAULT/heat_watch_server_url] - conntrackd: resources: [] - sahara-db: @@ -149,7 +153,7 @@ tasks: - File[/etc/openstack-dashboard/local_settings.py] - Exec[concat_/etc/openstack-dashboard/local_settings.py] - openstack-haproxy-ceilometer: - resources: [] + no_puppet_run: true - openstack-network-common-config: resources: [] - firewall: @@ -157,14 +161,13 @@ tasks: - apache: resources: [] - globals: - resources: - - File[/etc/hiera/globals.yaml] + resources: [] - aodh-keystone: no_puppet_run: true - glance: resources: - Glance_swift_config[ref1/user] - - Glance_glare_config[glance_store/swift_store_create_container_on_put] + - Glance_swift_config[ref1/project_domain_id] - Glance_glare_config[glance_store/swift_store_config_file] - Package[swift] - Glance_api_config[glance_store/default_store] @@ -174,10 +177,12 @@ tasks: - Glance_glare_config[DEFAULT/default_log_levels] - Glance_api_config[glance_store/stores] - Glance_cache_config[DEFAULT/image_cache_max_size] + - Glance_swift_config[ref1/user_domain_id] - Glance_glare_config[glance_store/default_store] - Glance_registry_config[DEFAULT/default_log_levels] - Glance_api_config[DEFAULT/default_log_levels] - Glance_glare_config[glance_store/swift_store_region] + - Glance_glare_config[glance_store/swift_store_create_container_on_put] - Glance_cache_config[DEFAULT/debug] - Glance_glare_config[glance_store/swift_store_endpoint_type] - Glance_api_config[DEFAULT/debug] @@ -185,6 +190,7 @@ tasks: - Glance_api_config[glance_store/swift_store_config_file] - Glance_api_config[DEFAULT/show_image_direct_url] - Glance_glare_config[glance_store/stores] + - Glance_swift_config[ref1/auth_version] - Glance_api_config[glance_store/default_swift_reference] - Glance_glare_config[glance_store/swift_store_large_object_size] - Glance_registry_config[DEFAULT/debug] @@ -204,14 +210,16 @@ 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: resources: [] - openstack-network-routers-ha: no_puppet_run: true + - upload_murano_package: + no_puppet_run: true - glance-db: resources: [] - neutron-db: @@ -255,8 +263,7 @@ tasks: - clear_nodes_info: type: skipped - murano-db: - resources: - - Exec[clear_nodes_info_shell] + no_puppet_run: true - copy_keys_ceph: type: copy_files - sahara: @@ -301,6 +308,7 @@ tasks: resources: [] - primary-database: resources: + - File[mysql-config-file] - File[/root/.my.cnf] - vcenter_compute_zones_create: type: shell @@ -313,21 +321,136 @@ tasks: resources: [] - murano-keystone: no_puppet_run: true + - swift-proxy_storage: + resources: + - Swift_dispersion_config[dispersion/dispersion_coverage] + - Ring_account_device[10.109.2.2:6002/1] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf] + - File[/etc/swift/dispersion.conf] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/31_swift-proxy-formpost] + - Exec[create_account] + - Swift_dispersion_config[dispersion/auth_url] + - Swift_dispersion_config[dispersion/dump_json] + - Package[swift-object] + - File[/var/lib/puppet/concat/_etc_swift_account-server.conf] + - File[/etc/swift/swift.conf] + - File[/var/lib/glance] + - Service[swift-account-server] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_server_frag-swift_server] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/35_swift_slo] + - Ring_object_device[10.109.2.2:6000/2] + - Package[swift-plugin-s3] + - File[/etc/swift/account-server.conf] + - Service[swift-account-replicator] + - Service[swift-container-server] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments.concat.out] + - File[/var/lib/puppet/concat/_etc_swift_account-server.conf/fragments.concat.out] + - File[/var/lib/puppet/concat/_etc_swift_account-server.conf/fragments] + - Package[swift-container] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/35_swift_crossdomain] + - File[/var/run/swift] + - File[/var/lib/puppet/concat/_etc_swift_container-server.conf] + - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments.concat.out] + - Service[swift-container-replicator] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments.concat] + - Swift_dispersion_config[dispersion/auth_user] + - Swift_dispersion_config[dispersion/endpoint_type] + - Service[swift-container-updater] + - File[/var/lib/puppet/concat/_etc_swift_object-server.conf] + - Service[swift-object-updater] + - Exec[create_container] + - File[/etc/swift/object-server.conf] + - Swift_dispersion_config[dispersion/auth_version] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/82_swift_container_sync] + - Exec[concat_/etc/rsyncd.conf] + - Service[swift-proxy-server] + - Swift_dispersion_config[dispersion/swift_dir] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/00_header_rsyncd_conf_header] + - File[/etc/swift/container-server.conf] + - Swift_container_sync_realms_config[realm1/cluster_name1] + - Service[swift-account-auditor] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments] + - Ring_container_device[10.109.2.2:6001/1] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_backups_frag-swift_backups] + - Swift_config[swift-constraints/max_header_size] + - File[/etc/swift] + - Service[swift-container-sync] + - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments.concat] + - File[/etc/swift/object-server/] + - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments/00_swift-object-6000] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/81_swift_container_quotas] + - File[/etc/swift/container-server/] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/26_swift_ratelimit] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/00_swift_proxy] + - File[/var/cache/swift] + - File[/var/lib/puppet/concat/_etc_swift_account-server.conf/fragments.concat] + - Ring_container_device[10.109.2.2:6001/2] + - File[/var/lib/swift] + - File[/etc/xinetd.d/rsync] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_account_frag-account] + - Swift_dispersion_config[dispersion/concurrency] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/22_swift_authtoken] + - Swift_config[swift-hash/swift_hash_path_suffix] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/80_swift_account_quotas] + - Swift_dispersion_config[dispersion/retries] + - Package[swift-account] + - File[/etc/swift/proxy-server.conf] + - Service[swift-account-reaper] + - Exec[concat_/etc/swift/container-server.conf] + - File[/var/lib/puppet/concat/_etc_swift_container-server.conf/fragments.concat] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_object_frag-object] + - File[/var/lib/puppet/concat/_etc_swift_container-server.conf/fragments/00_swift-container-6001] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/25_swift_healthcheck] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/24_swift_catch_errors] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/23_swift_cache] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/29_swift-proxy-tempurl] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/27_swift_swift3] + - Exec[create_object] + - Ring_object_device[10.109.2.2:6000/1] + - Swift_dispersion_config[dispersion/auth_key] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat.out] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/28_swift_s3token] + - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/32_swift-proxy-staticweb] + - Exec[concat_/etc/swift/account-server.conf] + - Service[swift-container-auditor] + - File[/var/lib/glance/node] + - Exec[concat_/etc/swift/proxy-server.conf] + - Service[swift-object-replicator] + - File[/etc/rsyncd.conf] + - Package[swift-proxy] + - Swift_container_sync_realms_config[realm1/key] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/79_swift_keystone] + - Service[swift-object-auditor] + - File[/etc/swift/account-server/] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf] + - File[/var/lib/puppet/concat/_etc_swift_account-server.conf/fragments/00_swift-account-6002] + - Ring_account_device[10.109.2.2:6002/2] + - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_container_frag-container] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments] + - File[/var/lib/puppet/concat/_etc_swift_container-server.conf/fragments.concat.out] + - Service[swift-object-server] + - Exec[concat_/etc/swift/object-server.conf] + - File[/var/lib/puppet/concat/_etc_swift_container-server.conf/fragments] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/21_swift_bulk] - primary-openstack-network-agents-dhcp: resources: - Neutron_dhcp_agent_config[DEFAULT/debug] - openstack-haproxy-heat: - resources: [] + no_puppet_run: true - primary-openstack-controller: resources: - Nova_config[DEFAULT/quota_driver] - Nova_config[DEFAULT/debug] + - Nova_config[DEFAULT/scheduler_default_filters] - Nova_config[DEFAULT/default_log_levels] - openstack-cinder: resources: - - Cinder_config[DEFAULT/scheduler_default_filters] - Cinder_config[DEFAULT/default_log_levels] - Cinder_config[DEFAULT/debug] + - ceph_create_pools: + resources: [] - keystone-db: resources: - File[/root/.my.cnf] @@ -339,71 +462,6 @@ tasks: resources: [] - copy_haproxy_keys: type: copy_files - - primary-swift-proxy: - resources: - - Swift_dispersion_config[dispersion/dispersion_coverage] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/81_swift_container_quotas] - - Ring_account_device[10.109.2.2:6002/1] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf] - - File[/etc/swift/dispersion.conf] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/31_swift-proxy-formpost] - - Package[swift-proxy] - - Exec[create_account] - - Swift_dispersion_config[dispersion/auth_url] - - Swift_dispersion_config[dispersion/dump_json] - - Ring_container_device[10.109.2.2:6001/2] - - File[/var/lib/swift] - - File[/etc/xinetd.d/rsync] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/00_swift_proxy] - - Swift_dispersion_config[dispersion/concurrency] - - File[/etc/swift/swift.conf] - - Swift_config[swift-hash/swift_hash_path_suffix] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/25_swift_healthcheck] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/80_swift_account_quotas] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/35_swift_slo] - - Swift_dispersion_config[dispersion/retries] - - File[/var/cache/swift] - - File[/etc/swift/proxy-server.conf] - - Package[swift-plugin-s3] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_server_frag-swift_server] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/24_swift_catch_errors] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/28_swift_s3token] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/35_swift_crossdomain] - - File[/var/run/swift] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments.concat] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/29_swift-proxy-tempurl] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/26_swift_ratelimit] - - Swift_dispersion_config[dispersion/auth_user] - - Swift_dispersion_config[dispersion/endpoint_type] - - Exec[create_object] - - Ring_object_device[10.109.2.2:6000/1] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf] - - Swift_dispersion_config[dispersion/auth_key] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat.out] - - Exec[create_container] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/23_swift_cache] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/32_swift-proxy-staticweb] - - Swift_dispersion_config[dispersion/auth_version] - - Exec[concat_/etc/swift/proxy-server.conf] - - Ring_object_device[10.109.2.2:6000/2] - - Exec[concat_/etc/rsyncd.conf] - - Service[swift-proxy-server] - - Swift_dispersion_config[dispersion/swift_dir] - - File[/etc/rsyncd.conf] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/79_swift_keystone] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/00_header_rsyncd_conf_header] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/27_swift_swift3] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat] - - Ring_account_device[10.109.2.2:6002/2] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/22_swift_authtoken] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments] - - Ring_container_device[10.109.2.2:6001/1] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_swift_backups_frag-swift_backups] - - Swift_config[swift-constraints/max_header_size] - - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments.concat.out] - - File[/etc/swift] - - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/21_swift_bulk] - openstack-network-networks: resources: [] - ssl-add-trust-chain: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/nodes_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/nodes_settings.yaml index e1d8e93e9..e0815aebf 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/nodes_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/1_ctrl_1_cmp_3_ceph/ensurability/nodes_settings.yaml @@ -2,7 +2,7 @@ controller: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -19,7 +19,7 @@ ceph-osd: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -36,7 +36,7 @@ compute: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/ceph-osd_compute.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/ceph-osd_compute.yaml index 2b3e9a996..4e359f7e8 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/ceph-osd_compute.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/ceph-osd_compute.yaml @@ -1,16 +1,6 @@ -tasks: - - plugins_rsync: - resources: - - Nova_config[libvirt/rbd_user] - - Nova_config[libvirt/rbd_secret_uuid] - - Nova_config[libvirt/images_rbd_pool] - - File[/etc/ceph/ceph.client.compute.keyring] - - Exec[Create compute pool] - - Exec[Populate compute keyring] - - Exec[Create compute Cephx user and ACL] - - Nova_config[libvirt/images_type] - - Exec[Set Ceph RBD secret for Nova] - - File[/root/.secret_attrs.xml] + tasks: + - update_hosts: + resources: [] - openstack-network-start: type: skipped - openstack-network-common-config: @@ -19,16 +9,16 @@ tasks: type: skipped - openstack-network-agents-sriov: resources: [] - - ceilometer-compute: - no_puppet_run: true + - override_configuration: + resources: [] - globals: resources: [] - fuel_pkgs: resources: [] - openstack-network-agents-l3: resources: [] - - configuration_symlink: - type: shell + - openstack-network-agents-metadata: + resources: [] - tools: resources: [] - rsync_core_puppet: @@ -41,22 +31,22 @@ tasks: type: skipped - copy_keys: type: copy_files - - sync_time: - type: shell - - override_configuration: - resources: [] + - copy_deleted_nodes: + type: copy_files - setup_repositories: resources: [] + - dns-client: + resources: [] - openstack-network-plugins-l2: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - plugins_setup_repositories: no_puppet_run: true - - connectivity_tests: + - updatedb: resources: [] - ceph-compute: - no_puppet_run: true + resources: [] - ssl-keys-saving: no_puppet_run: true - sriov_iommu_check: @@ -64,8 +54,6 @@ tasks: - Exec[sriov_iommu_check] - openstack-network-end: type: skipped - - copy_deleted_nodes: - type: copy_files - copy_keys_ceph: type: copy_files - upload_configuration: @@ -76,8 +64,6 @@ tasks: resources: [] - logging: resources: [] - - updatedb: - no_puppet_run: true - top-role-compute: resources: - Notify[Module openstack_tasks cannot notify service nova-compute on packages @@ -86,13 +72,17 @@ tasks: - Nova_config[vnc/novncproxy_base_url] - Nova_config[DEFAULT/vcpu_pin_set] - Service[nova-compute] + - sync_time: + type: shell - openstack-network-compute-nova: resources: [] - - update_hosts: + - plugins_rsync: + no_puppet_run: true + - connectivity_tests: resources: [] - - dns-client: - resources: [] - - openstack-network-agents-metadata: + - configuration_symlink: + type: shell + - ceilometer-compute: resources: [] - hosts: resources: [] diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml index 39d1764b9..a75841761 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/cluster_settings.yaml @@ -14,7 +14,7 @@ access: additional_components: ceilometer: type: checkbox - value: false + value: true heat: type: hidden value: false @@ -30,9 +30,6 @@ additional_components: murano-cfapi: type: checkbox value: false - murano_glance_artifacts_plugin: - type: checkbox - value: false sahara: type: checkbox value: false @@ -104,6 +101,9 @@ murano_settings: murano_repo_url: type: text value: http://storage.apps.openstack.org/ + murano_glance_artifacts_plugin: + type: checkbox + value: false neutron_advanced_configuration: neutron_dvr: type: checkbox @@ -395,13 +395,13 @@ storage: value: AQDLzzFXAAAAABAA5IKvoBQEHTMdItiodpG3dw== volumes_block_device: type: checkbox - value: true + value: false volumes_ceph: type: checkbox - value: false + value: true volumes_lvm: type: checkbox - value: true + value: false syslog: syslog_port: type: text diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml index 8ace294fc..1ef8ec565 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/controller_mongo.yaml @@ -4,19 +4,20 @@ tasks: - openstack-network-agents-l3: resources: [] - dump_rabbitmq_definitions: - resources: + skip: - Dump_rabbitmq_definitions[/etc/rabbitmq/definitions.full] + resources: [] - rsync_core_puppet: type: sync - ssl-dns-setup: resources: - Exec[rsync_core_puppet_shell] - ceilometer-controller: - no_puppet_run: true + resources: [] - override_configuration: resources: [] - ceph_create_pools: - no_puppet_run: true + resources: [] - virtual_ips: resources: [] - openstack-haproxy-murano: @@ -30,13 +31,13 @@ tasks: - openstack-haproxy-neutron: resources: [] - updatedb: - no_puppet_run: true + resources: [] - plugins_rsync: no_puppet_run: true - openstack-controller: resources: [] - - ceilometer-radosgw-user: - no_puppet_run: true + - rabbitmq: + resources: [] - openstack-haproxy-keystone: resources: [] - hosts: @@ -53,8 +54,8 @@ tasks: no_puppet_run: true - vmware-vcenter: no_puppet_run: true - - rabbitmq: - resources: [] + - ceilometer-radosgw-user: + no_puppet_run: true - ironic-compute: no_puppet_run: true - dns-server: @@ -78,7 +79,7 @@ tasks: - memcached: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - openrc-delete: resources: - File[/root/openrc] @@ -110,7 +111,10 @@ tasks: - File[/etc/openstack-dashboard/local_settings.py] - Exec[concat_/etc/openstack-dashboard/local_settings.py] - openstack-haproxy-ceilometer: - no_puppet_run: true + resources: + - Exec[concat_/etc/haproxy/conf.d/140-ceilometer.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_140-ceilometer.cfg/fragments/00_ceilometer_listen_block] + - File[/etc/haproxy/conf.d/140-ceilometer.cfg] - openstack-network-common-config: resources: [] - firewall: @@ -118,12 +122,11 @@ tasks: - cluster-haproxy: resources: [] - globals: - resources: - - File[/etc/hiera/globals.yaml] + resources: [] - glance: resources: - Glance_swift_config[ref1/user] - - Glance_glare_config[glance_store/swift_store_create_container_on_put] + - Glance_swift_config[ref1/project_domain_id] - Glance_glare_config[glance_store/swift_store_config_file] - Package[swift] - Glance_api_config[glance_store/default_store] @@ -133,11 +136,12 @@ tasks: - Glance_glare_config[DEFAULT/default_log_levels] - Glance_api_config[glance_store/stores] - Glance_cache_config[DEFAULT/image_cache_max_size] + - Glance_swift_config[ref1/user_domain_id] - Glance_glare_config[glance_store/default_store] - Glance_registry_config[DEFAULT/default_log_levels] - - Glance_api_config[DEFAULT/notification_driver] - Glance_api_config[DEFAULT/default_log_levels] - Glance_glare_config[glance_store/swift_store_region] + - Glance_glare_config[glance_store/swift_store_create_container_on_put] - Glance_cache_config[DEFAULT/debug] - Glance_glare_config[glance_store/swift_store_endpoint_type] - Glance_api_config[DEFAULT/debug] @@ -145,6 +149,7 @@ tasks: - Glance_api_config[glance_store/swift_store_config_file] - Glance_api_config[DEFAULT/show_image_direct_url] - Glance_glare_config[glance_store/stores] + - Glance_swift_config[ref1/auth_version] - Glance_api_config[glance_store/default_swift_reference] - Glance_glare_config[glance_store/swift_store_large_object_size] - Glance_registry_config[DEFAULT/debug] @@ -161,7 +166,10 @@ tasks: - cgroups: resources: [] - aodh: - no_puppet_run: true + resources: + - Aodh_config[api/pecan_debug] + - Aodh_config[DEFAULT/debug] + - Aodh_config[DEFAULT/default_log_levels] - copy_deleted_nodes: type: copy_files - openstack-haproxy-ironic: @@ -175,15 +183,22 @@ tasks: - heat: resources: - Heat_config[DEFAULT/reauthentication_auth_method] + - Heat_config[DEFAULT/heat_waitcondition_server_url] + - Heat_config[DEFAULT/heat_metadata_server_url] - Heat_config[keystone_authtoken/auth_uri] - Heat_config[DEFAULT/default_log_levels] + - Heat_config[clients_heat/url] + - Heat_config[DEFAULT/heat_watch_server_url] - Heat_config[DEFAULT/debug] - openstack-haproxy-stats: resources: [] - ironic-api: no_puppet_run: true - top-role-mongo: - no_puppet_run: true + resources: + - Mongodb_user[User ceilometer on db ceilometer] + - File[/etc/mongodb.conf] + - Mongodb_user[User admin on db admin] - dns-client: resources: [] - cluster-vrouter: @@ -207,6 +222,8 @@ tasks: - copy_keys_ceph: type: copy_files - cluster: + skip: + - Pcmk_property[no-quorum-policy] resources: [] - sahara: no_puppet_run: true @@ -252,7 +269,6 @@ tasks: no_puppet_run: true - openstack-cinder: resources: - - Cinder_config[DEFAULT/scheduler_default_filters] - Cinder_config[DEFAULT/default_log_levels] - Cinder_config[DEFAULT/debug] - sync_time: diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/nodes_settings.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/nodes_settings.yaml index 08febc75d..97737d880 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/nodes_settings.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/nodes_settings.yaml @@ -2,7 +2,7 @@ ceph-osd_compute: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 @@ -19,7 +19,7 @@ controller_mongo: cpu_pinning: dpdk: type: number - value: 1 + value: 0 nova: type: number value: 1 diff --git a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml index 17b667656..666bed6ce 100644 --- a/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml +++ b/fuelweb_test/tests/tests_lcm/fixtures/3_ctrl_3_cmp_ceph_sahara/ensurability/primary-controller_mongo.yaml @@ -4,24 +4,26 @@ tasks: - openstack-haproxy-mysqld: resources: [] - top-role-primary-mongo: - no_puppet_run: true + resources: [] - cinder-db: resources: [] - dump_rabbitmq_definitions: - resources: + skip: - Dump_rabbitmq_definitions[/etc/rabbitmq/definitions.full] + resources: [] - rsync_core_puppet: type: sync - - create-cinder-types: - resources: [] + - ssl-dns-setup: + resources: + - Exec[rsync_core_puppet_shell] - ceilometer-controller: - no_puppet_run: true + resources: [] - override_configuration: resources: [] - ceilometer-keystone: - no_puppet_run: true - - ceph_create_pools: - no_puppet_run: true + resources: [] + - nova-db: + resources: [] - workloads_collector_add: resources: [] - primary-openstack-network-plugins-l2: @@ -45,7 +47,7 @@ tasks: - openstack-haproxy-neutron: resources: [] - updatedb: - no_puppet_run: true + resources: [] - ironic-db: no_puppet_run: true - plugins_rsync: @@ -87,7 +89,7 @@ tasks: - ntp-check: resources: [] - aodh-db: - no_puppet_run: true + resources: [] - disable_keystone_service_token: no_puppet_run: true - umm: @@ -95,7 +97,7 @@ tasks: - memcached: resources: [] - allocate_hugepages: - resources: [] + no_puppet_run: true - openrc-delete: resources: - File[/root/openrc] @@ -108,6 +110,8 @@ tasks: - ssl-keys-saving: no_puppet_run: true - primary-cluster: + skip: + - Pcmk_property[no-quorum-policy] resources: [] - upload_cirros: type: shell @@ -118,8 +122,8 @@ tasks: resources: [] - upload_configuration: type: upload_file - - ssl-dns-setup: - no_puppet_run: true + - create-cinder-types: + resources: [] - neutron-keystone: resources: - Keystone_endpoint[RegionOne/neutron::network] @@ -130,7 +134,7 @@ tasks: - nova-keystone: resources: - Keystone_endpoint[RegionOne/nova::compute] - - Keystone_endpoint[RegionOne/novav3::computev3] + - Keystone_endpoint[RegionOne/compute_legacy::compute_legacy] - update_hosts: resources: [] - ironic-keystone: @@ -139,7 +143,11 @@ tasks: resources: [] - primary-heat: resources: + - Heat_config[DEFAULT/heat_waitcondition_server_url] + - Heat_config[DEFAULT/heat_metadata_server_url] - Heat_config[keystone_authtoken/auth_uri] + - Heat_config[clients_heat/url] + - Heat_config[DEFAULT/heat_watch_server_url] - conntrackd: resources: [] - sahara-db: @@ -150,7 +158,10 @@ tasks: - File[/etc/openstack-dashboard/local_settings.py] - Exec[concat_/etc/openstack-dashboard/local_settings.py] - openstack-haproxy-ceilometer: - no_puppet_run: true + resources: + - Exec[concat_/etc/haproxy/conf.d/140-ceilometer.cfg] + - File[/var/lib/puppet/concat/_etc_haproxy_conf.d_140-ceilometer.cfg/fragments/00_ceilometer_listen_block] + - File[/etc/haproxy/conf.d/140-ceilometer.cfg] - openstack-network-common-config: resources: [] - firewall: @@ -158,14 +169,14 @@ tasks: - apache: resources: [] - globals: - resources: - - File[/etc/hiera/globals.yaml] + resources: [] - aodh-keystone: - no_puppet_run: true + resources: + - Keystone_endpoint[RegionOne/aodh::alarming] - glance: resources: - Glance_swift_config[ref1/user] - - Glance_glare_config[glance_store/swift_store_create_container_on_put] + - Glance_swift_config[ref1/project_domain_id] - Glance_glare_config[glance_store/swift_store_config_file] - Package[swift] - Glance_api_config[glance_store/default_store] @@ -175,11 +186,12 @@ tasks: - Glance_glare_config[DEFAULT/default_log_levels] - Glance_api_config[glance_store/stores] - Glance_cache_config[DEFAULT/image_cache_max_size] + - Glance_swift_config[ref1/user_domain_id] - Glance_glare_config[glance_store/default_store] - Glance_registry_config[DEFAULT/default_log_levels] - - Glance_api_config[DEFAULT/notification_driver] - Glance_api_config[DEFAULT/default_log_levels] - Glance_glare_config[glance_store/swift_store_region] + - Glance_glare_config[glance_store/swift_store_create_container_on_put] - Glance_cache_config[DEFAULT/debug] - Glance_glare_config[glance_store/swift_store_endpoint_type] - Glance_api_config[DEFAULT/debug] @@ -187,6 +199,7 @@ tasks: - Glance_api_config[glance_store/swift_store_config_file] - Glance_api_config[DEFAULT/show_image_direct_url] - Glance_glare_config[glance_store/stores] + - Glance_swift_config[ref1/auth_version] - Glance_api_config[glance_store/default_swift_reference] - Glance_glare_config[glance_store/swift_store_large_object_size] - Glance_registry_config[DEFAULT/debug] @@ -205,7 +218,10 @@ tasks: - murano-cfapi-keystone: no_puppet_run: true - aodh: - no_puppet_run: true + resources: + - Aodh_config[api/pecan_debug] + - Aodh_config[DEFAULT/debug] + - Aodh_config[DEFAULT/default_log_levels] - copy_deleted_nodes: type: copy_files - openstack-haproxy-ironic: @@ -214,20 +230,21 @@ tasks: resources: [] - openstack-network-routers-ha: no_puppet_run: true + - upload_murano_package: + no_puppet_run: true - glance-db: resources: [] - neutron-db: resources: [] - ironic_upload_images: type: shell - - nova-db: - resources: [] - swift-rebalance-cron: resources: - File[/usr/local/bin/swift-rings-rebalance.sh] - Cron[swift-rings-rebalance] - primary-ceph-mon: - resources: [] + resources: + - Exec[ceph-deploy gatherkeys] - openstack-haproxy-stats: resources: [] - ironic-api: @@ -359,13 +376,16 @@ tasks: - Service[swift-object-updater] - Exec[create_container] - File[/etc/swift/object-server.conf] + - File[/var/log/ceilometer/swift-proxy-server.log] - Swift_dispersion_config[dispersion/auth_version] - Ring_container_device[10.109.2.5:6001/2] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/82_swift_container_sync] - Exec[concat_/etc/rsyncd.conf] - Service[swift-proxy-server] - Swift_dispersion_config[dispersion/swift_dir] - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/00_header_rsyncd_conf_header] - File[/etc/swift/container-server.conf] + - Swift_container_sync_realms_config[realm1/cluster_name1] - Service[swift-account-auditor] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat] - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments] @@ -375,8 +395,9 @@ tasks: - File[/etc/swift] - Ring_container_device[10.109.2.5:6001/1] - Ring_container_device[10.109.2.3:6001/1] - - Service[swift-container-server] + - Ring_object_device[10.109.2.2:6000/1] - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments.concat] + - User[swift] - File[/var/lib/puppet/concat/_etc_swift_container-server.conf/fragments] - File[/var/lib/puppet/concat/_etc_swift_object-server.conf/fragments/00_swift-object-6000] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/81_swift_container_quotas] @@ -408,7 +429,7 @@ tasks: - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/29_swift-proxy-tempurl] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/27_swift_swift3] - Exec[create_object] - - Ring_object_device[10.109.2.2:6000/1] + - Service[swift-container-server] - Swift_dispersion_config[dispersion/auth_key] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments.concat.out] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/28_swift_s3token] @@ -424,11 +445,13 @@ tasks: - Ring_container_device[10.109.2.3:6001/2] - File[/etc/rsyncd.conf] - Package[swift-proxy] + - Swift_container_sync_realms_config[realm1/key] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/79_swift_keystone] - Service[swift-object-auditor] - File[/etc/swift/account-server/] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf] - Ring_account_device[10.109.2.3:6002/2] + - Package[python-ceilometermiddleware] - File[/var/lib/puppet/concat/_etc_swift_account-server.conf/fragments/00_swift-account-6002] - Ring_account_device[10.109.2.2:6002/2] - File[/var/lib/puppet/concat/_etc_rsyncd.conf/fragments/10_container_frag-container] @@ -437,6 +460,7 @@ tasks: - Service[swift-object-server] - Exec[concat_/etc/swift/object-server.conf] - File[/etc/swift/object-server/] + - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/33_swift_ceilometer] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/24_swift_catch_errors] - File[/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/21_swift_bulk] - primary-openstack-network-agents-dhcp: @@ -452,9 +476,10 @@ tasks: - Nova_config[DEFAULT/default_log_levels] - openstack-cinder: resources: - - Cinder_config[DEFAULT/scheduler_default_filters] - Cinder_config[DEFAULT/default_log_levels] - Cinder_config[DEFAULT/debug] + - ceph_create_pools: + resources: [] - keystone-db: resources: - File[/root/.my.cnf]