Improve Panko formula
- enabled kitchen tests
- removed unneeded kitchen ymls
- added possibility to configure site from pillar
- fixed small issues with pillars
- fixed old site template
Change-Id: Iba29c459794bc350ab0640a0447efaa6e9512dfd
Related-Prod: PROD-17189
diff --git a/tests/pillar/repo_mcp_openstack_pike.sls b/tests/pillar/repo_mcp_openstack_pike.sls
new file mode 100644
index 0000000..789b907
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -0,0 +1,12 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+ pin:
+ - pin: 'release a=pike'
+ priority: 1050
+ package: '*'
\ No newline at end of file
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index ac67542..5176570 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -1,6 +1,5 @@
panko:
server:
- region: RegionOne
enabled: true
version: pike
bind:
@@ -14,6 +13,7 @@
user: panko
password: misterio
endpoint_type: internalURL
+ region: RegionOne
database:
engine: mysql
host: 127.0.0.1
@@ -25,6 +25,47 @@
engine: memcached
members:
- host: 127.0.0.1
+ port: 11211
- host: 127.0.0.1
+ port: 11211
- host: 127.0.0.1
-
+ port: 11211
+apache:
+ server:
+ enabled: true
+ default_mpm: event
+ mpm:
+ prefork:
+ enabled: true
+ servers:
+ start: 5
+ spare:
+ min: 2
+ max: 10
+ max_requests: 0
+ max_clients: 20
+ limit: 20
+ site:
+ panko:
+ enabled: false
+ available: true
+ type: wsgi
+ name: panko
+ host:
+ name: panko.ci.local
+ address: 127.0.0.1
+ port: 8977
+ log:
+ custom:
+ format: >-
+ %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ wsgi:
+ daemon_process: panko-api
+ processes: 2
+ threads: 1
+ user: panko
+ group: panko
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/panko-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index a85faa0..44fe17c 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -1,6 +1,5 @@
panko:
server:
- region: RegionOne
enabled: true
version: pike
bind:
@@ -14,6 +13,7 @@
user: panko
password: misterio
endpoint_type: internalURL
+ region: RegionOne
database:
engine: mysql
host: 127.0.0.1
@@ -21,3 +21,47 @@
name: panko
user: panko
password: misterio
+ cache:
+ engine: memcached
+ members:
+ - host: 127.0.0.1
+ port: 11211
+apache:
+ server:
+ enabled: true
+ default_mpm: event
+ mpm:
+ prefork:
+ enabled: true
+ servers:
+ start: 5
+ spare:
+ min: 2
+ max: 10
+ max_requests: 0
+ max_clients: 20
+ limit: 20
+ site:
+ panko:
+ enabled: false
+ available: true
+ type: wsgi
+ name: panko
+ host:
+ name: panko.ci.local
+ address: 127.0.0.1
+ port: 8977
+ log:
+ custom:
+ format: >-
+ %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ wsgi:
+ daemon_process: panko-api
+ processes: 2
+ threads: 10
+ user: panko
+ group: panko
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/panko-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'