Add runtest pillar to virtual-offline-*
* Add runtest pillar to ssl and dpdk model
* Depricate virtual-offline-ovs as it is replaced
with bm deploy
Change-Id: I729e8a8fa202b90ced597cc6b608bf97aa6c1620
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml
index 18cabd8..9d0cace 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml
@@ -3,7 +3,6 @@
parameters:
_param:
xtrabackup_remote_server: ${_param:openstack_control_node03_address}
- xtrabackup_qpress_source_name: http://${_param:aptly_server_address}:8078/qpress-11-linux-x64.tar
root_private_key: |
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 5413b91..e7c04f7 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -39,6 +39,7 @@
- system.jenkins.client.credential.salt
- system.jenkins.client.job.deploy.openstack
- cluster.virtual-offline-pike-ovs-dpdk.infra
+- cluster.virtual-offline-pike-ovs-dpdk.infra.runtest
- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
parameters:
_param:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/runtest.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/runtest.yml
new file mode 100644
index 0000000..172d161
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/runtest.yml
@@ -0,0 +1,48 @@
+classes:
+- service.runtest.tempest
+- service.runtest.tempest.public_net
+- service.runtest.tempest.services.manila.glance
+parameters:
+ _param:
+ image_url: http://cz8133.bud.mirantis.net:8099
+ glance_image_cirros_location: ${_param:image_url}/cirros-0.3.5-x86_64-disk.img
+ glance_image_fedora_location: ${_param:image_url}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
+ glance_image_manila_location: ${_param:image_url}/manila-service-image-master.qcow2
+ openstack_public_neutron_subnet_allocation_end: 10.16.0.246
+ openstack_public_neutron_subnet_allocation_start: 10.16.0.10
+ openstack_public_neutron_subnet_cidr: 10.16.0.0/24
+ openstack_public_neutron_subnet_gateway: 10.16.0.1
+ runtest_tempest_cfg_dir: /tmp/test
+ runtest_tempest_cfg_name: tempest.conf
+ runtest_tempest_public_net: public
+ tempest_test_target: gtw01.${_param:cluster_domain}*
+ neutron:
+ client:
+ enabled: true
+ runtest:
+ enabled: true
+ keystonerc_node: ctl01*
+ tempest:
+ DEFAULT:
+ log_file: tempest.log
+ cfg_dir: ${_param:runtest_tempest_cfg_dir}
+ cfg_name: ${_param:runtest_tempest_cfg_name}
+ compute:
+ min_compute_nodes: 2
+ convert_to_uuid:
+ network:
+ public_network_id: ${_param:runtest_tempest_public_net}
+ enabled: true
+ heat_plugin:
+ build_timeout: '600'
+ put_keystone_rc_enabled: true
+ put_local_image_file_enabled: false
+ share:
+ capability_snapshot_support: true
+ run_driver_assisted_migration_tests: false
+ run_manage_unmanage_snapshot_tests: false
+ run_manage_unmanage_tests: false
+ run_migration_with_preserve_snapshots_tests: false
+ run_quota_tests: true
+ run_replication_tests: false
+ run_snapshot_tests: true
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml b/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml
index 18cabd8..9d0cace 100644
--- a/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml
@@ -3,7 +3,6 @@
parameters:
_param:
xtrabackup_remote_server: ${_param:openstack_control_node03_address}
- xtrabackup_qpress_source_name: http://${_param:aptly_server_address}:8078/qpress-11-linux-x64.tar
root_private_key: |
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index 7dc2280..bd2de67 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -36,6 +36,7 @@
- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-offline-ssl.infra.backup.client_common
+- cluster.virtual-offline-ssl.infra.runtest
- cluster.virtual-offline-ssl
parameters:
_param:
diff --git a/classes/cluster/virtual-offline-ssl/infra/runtest.yml b/classes/cluster/virtual-offline-ssl/infra/runtest.yml
new file mode 100644
index 0000000..0ba7e0b
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/infra/runtest.yml
@@ -0,0 +1,49 @@
+classes:
+- service.runtest.tempest
+- service.runtest.tempest.public_net
+- service.runtest.tempest.services.manila.glance
+- service.runtest.tempest.barbican
+parameters:
+ _param:
+ image_url: http://cz8133.bud.mirantis.net:8099
+ glance_image_cirros_location: ${_param:image_url}/cirros-0.3.5-x86_64-disk.img
+ glance_image_fedora_location: ${_param:image_url}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
+ glance_image_manila_location: ${_param:image_url}/manila-service-image-master.qcow2
+ openstack_public_neutron_subnet_allocation_end: 10.16.0.246
+ openstack_public_neutron_subnet_allocation_start: 10.16.0.10
+ openstack_public_neutron_subnet_cidr: 10.16.0.0/24
+ openstack_public_neutron_subnet_gateway: 10.16.0.1
+ runtest_tempest_cfg_dir: /tmp/test
+ runtest_tempest_cfg_name: tempest.conf
+ runtest_tempest_public_net: public
+ tempest_test_target: gtw01.${_param:cluster_domain}*
+ neutron:
+ client:
+ enabled: true
+ runtest:
+ enabled: true
+ keystonerc_node: ctl01*
+ tempest:
+ DEFAULT:
+ log_file: tempest.log
+ cfg_dir: ${_param:runtest_tempest_cfg_dir}
+ cfg_name: ${_param:runtest_tempest_cfg_name}
+ compute:
+ min_compute_nodes: 2
+ convert_to_uuid:
+ network:
+ public_network_id: ${_param:runtest_tempest_public_net}
+ enabled: true
+ heat_plugin:
+ build_timeout: '600'
+ put_keystone_rc_enabled: true
+ put_local_image_file_enabled: false
+ share:
+ capability_snapshot_support: true
+ run_driver_assisted_migration_tests: false
+ run_manage_unmanage_snapshot_tests: false
+ run_manage_unmanage_tests: false
+ run_migration_with_preserve_snapshots_tests: false
+ run_quota_tests: true
+ run_replication_tests: false
+ run_snapshot_tests: true
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/infra/config.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/infra/config.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/infra/config.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/init.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/infra/init.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/infra/init.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/init.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/init.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/init.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/compute.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/compute.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/control.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/control.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/dashboard.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/gateway.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/init.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/openstack/proxy.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/client.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/client.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/stacklight/client.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/client.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/init.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/stacklight/init.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/init.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/proxy.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/stacklight/proxy.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/proxy.yml
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml b/classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/server.yml
similarity index 100%
rename from classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
rename to classes/cluster_deprecated/virtual-offline-pike-ovs/stacklight/server.yml