Add ability to configure handlers from pillar
- enabled handlers option placed in correct section for queens
- added ability to configure handlers for queens from pillar
- updated kitchen
- added kitchen verification
- removed unsupported liberty
Change-Id: I7eca089df75d317b018ddc989c57f8cf74a64cf4
Related-Prod: https://mirantis.jira.com/browse/PROD-24488
diff --git a/.kitchen.yml b/.kitchen.yml
index d4af7dc..db2ef8f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -2,7 +2,7 @@
driver:
name: docker
hostname: designate.ci.local
- use_sudo: true
+ use_sudo: false
provisioner:
name: salt_solo
@@ -18,27 +18,67 @@
- name: linux
repo: git
source: https://github.com/salt-formulas/salt-formula-linux
- - name: mysql
+ - name: oslo_templates
repo: git
- source: https://github.com/salt-formulas/salt-formula-mysql
- - name: rabbitmq
- repo: git
- source: https://github.com/salt-formulas/salt-formula-rabbitmq
+ source: https://github.com/salt-formulas/salt-formula-oslo-templates
state_top:
base:
"*":
- linux
- - mysql
- - rabbitmq
- designate
pillars:
+ release.sls:
+ designate:
+ server:
+ version: <%= ENV['OS_VERSION'] || 'pike' %>
+ ssl.sls:
+ designate:
+ server:
+ identity:
+ protocol: https
+ database:
+ x509:
+ enabled: True
+ ca_file: /etc/designate/ssl/mysql/ca-cert.pem
+ key_file: /etc/designate/ssl/mysql/client-key.pem
+ cert_file: /etc/designate/ssl/mysql/client-cert.pem
+ cacert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+ -----END CERTIFICATE-----
+ cert: |
+ -----BEGIN CERTIFICATE-----
+ MIIGSjCCBDKgAwIBAgIJAIHRPs2rZbLvMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+ -----END CERTIFICATE-----
+ key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIJKQIBAAKCAgEAq0m4kOIITliYea07yJnlSRNY0o6NaykiteSfHGauiub4lNQJ
+ -----END RSA PRIVATE KEY-----
+ ssl:
+ enabled: True
+ cacert_file: /etc/designate/ssl/mysql/ca-cert.pem
+ cacert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+ -----END CERTIFICATE-----
+ message_queue:
+ port: 5671
+ ssl:
+ enabled: True
+ cacert_file: /etc/designate/ssl/mysql/ca-cert.pem
+ cacert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+ -----END CERTIFICATE-----
+
top.sls:
base:
"*":
- linux_repo_openstack
- designate
+ - release
pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
verifier:
name: inspec
@@ -52,9 +92,56 @@
suites:
- - name: designate_without_backend
+ - name: server_cluster
provisioner:
pillars-from-files:
- designate.sls: tests/pillar/designate_ocata.sls
+ designate.sls: tests/pillar/server_cluster.sls
+ verifier:
+ inspec_tests:
+ - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+
+ - name: server_single
+ provisioner:
+ pillars-from-files:
+ designate.sls: tests/pillar/server_single.sls
+ verifier:
+ inspec_tests:
+ - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+
+ - name: server_cluster_ssl
+ provisioner:
+ pillars-from-files:
+ designate.sls: tests/pillar/server_cluster.sls
+ pillars:
+ top.sls:
+ base:
+ "*":
+ - linux_repo_openstack
+ - designate
+ - release
+ - ssl
+ verifier:
+ inspec_tests:
+ - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+ attributes:
+ ssl: true
+
+ - name: server_single_ssl
+ provisioner:
+ pillars-from-files:
+ designate.sls: tests/pillar/server_single.sls
+ pillars:
+ top.sls:
+ base:
+ "*":
+ - linux_repo_openstack
+ - designate
+ - release
+ - ssl
+ verifier:
+ inspec_tests:
+ - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+ attributes:
+ ssl: true
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125