Merge "Formulas testing revision 2019/10"
diff --git a/.kitchen.yml b/.kitchen.yml
index f9f9386..816a77d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -41,8 +41,7 @@
sudo: true
docker_images:
- - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
- - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
platforms:
- name: xenial-2017.7
@@ -50,13 +49,8 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
- driver_config:
- image: *xenial-stable
- platform: ubuntu
-
suites:
-<% for os_version in ['ocata','pike'] %>
+<% for os_version in ['pike', 'queens', 'rocky'] %>
- name: agent_cluster_<%=os_version%>
provisioner:
pillars-from-files:
@@ -128,81 +122,57 @@
pillars-from-files:
ceilometer.sls: tests/pillar/server_cluster.sls
linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_server.sls
pillars:
release.sls:
ceilometer:
server:
version: <%=os_version%>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
- name: server_gnocchi_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_server.sls
pillars:
release.sls:
ceilometer:
server:
version: <%=os_version%>
- ssl.sls:
- ceilometer:
- server:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
- name: agent_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_cluster.sls
linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ ssl.sls: tests/pillar/_ssl_agent.sls
pillars:
release.sls:
ceilometer:
agent:
version: <%=os_version%>
- ssl.sls:
- ceilometer:
- agent:
- identity:
- protocol: https
- message_queue:
- port: 5671
- ssl:
- enabled: True
top.sls:
base:
"*":
- linux_repo_openstack
- ceilometer
- - release
- ssl
+ - release
<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/tests/pillar/_ssl_agent.sls b/tests/pillar/_ssl_agent.sls
new file mode 100644
index 0000000..08fa0c5
--- /dev/null
+++ b/tests/pillar/_ssl_agent.sls
@@ -0,0 +1,16 @@
+ceilometer:
+ agent:
+ enabled: true
+ version: pike
+ identity:
+ protocol: https
+ message_queue:
+ port: 5671
+ ssl:
+ enabled: true
+ version: '2.1'
+ cacert_file: /etc/ceilometer/cacert.pem
+ cacert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+ -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/pillar/_ssl_server.sls b/tests/pillar/_ssl_server.sls
new file mode 100644
index 0000000..ab722b4
--- /dev/null
+++ b/tests/pillar/_ssl_server.sls
@@ -0,0 +1,31 @@
+ceilometer:
+ server:
+ enabled: true
+ version: pike
+ identity:
+ protocol: https
+ engine: keystone
+ host: 127.0.0.1
+ port: 35357
+ tenant: service
+ user: ceilometer
+ password: password
+ endpoint_type: internalURL
+ bind:
+ host: 127.0.0.1
+ port: 8777
+ ttl: 86400
+ message_queue:
+ host: 127.0.0.1
+ port: 5671
+ user: openstack
+ password: password
+ virtual_host: '/openstack'
+ ssl:
+ enabled: true
+ version: '2.1'
+ cacert_file: /etc/ceilometer/cacert.pem
+ cacert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+ -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
deleted file mode 100644
index e601208..0000000
--- a/tests/pillar/repo_mcp_openstack_ocata.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-uptades'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-holdback'
- priority: 1050
- package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_pike.sls b/tests/pillar/repo_mcp_openstack_pike.sls
index 789b907..8905a98 100644
--- a/tests/pillar/repo_mcp_openstack_pike.sls
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -3,10 +3,10 @@
enabled: true
repo:
mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+ source: "deb http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+ key_url: "http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
pin:
- - pin: 'release a=pike'
+ - pin: 'release l=pike'
priority: 1050
package: '*'
\ No newline at end of file