Merge pull request #259 from jiribroulik/master
ctl upgrade fixes
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index a8b1f90..9758af2 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -1,7 +1,7 @@
classes:
- service.ceilometer.server.single
parameters:
- ceilometer:
+ ceilometer:
server:
database:
influxdb:
diff --git a/glusterfs/cluster.yml b/glusterfs/cluster.yml
index e69de29..8a5c595 100644
--- a/glusterfs/cluster.yml
+++ b/glusterfs/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.glusterfs.server
diff --git a/horizon/server/cluster.yml b/horizon/server/cluster.yml
index fbe8df4..8ee48a3 100644
--- a/horizon/server/cluster.yml
+++ b/horizon/server/cluster.yml
@@ -1,5 +1,16 @@
classes:
- service.keepalived.cluster.single
-- service.horizon.server.single
+- service.horizon.server.cluster
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.horizon
+- system.memcached.server.single
+parameters:
+ _param:
+ horizon_site_branding: "OpenStack Dashboard"
+ horizon:
+ server:
+ branding: ${_param:horizon_site_branding}
+ plugin: {}
+ session:
+ engine: "cache"
+
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index c20de5a..2b59f52 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -1,8 +1,9 @@
classes:
- service.horizon.server.single
+- system.memcached.server.single
parameters:
_param:
- horizon_site_branding: OpenStack Dashboard
+ horizon_site_branding: "OpenStack Dashboard"
horizon:
server:
branding: ${_param:horizon_site_branding}
@@ -10,3 +11,6 @@
address: 0.0.0.0
port: 8078
plugin: {}
+ session:
+ engine: "cache"
+
diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/devops-portal.yml
index 50f72a4..14735b6 100644
--- a/jenkins/client/job/docker/devops-portal.yml
+++ b/jenkins/client/job/docker/devops-portal.yml
@@ -22,6 +22,11 @@
"oss/devops-portal":
branches:
- master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
event:
patchset:
- created:
diff --git a/jenkins/master/single.yml b/jenkins/master/single.yml
index e69de29..9d5a611 100644
--- a/jenkins/master/single.yml
+++ b/jenkins/master/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.jenkins.master.single
diff --git a/linux/network/interface/bond_ovs_dvr.yml b/linux/network/interface/bond_ovs_dvr.yml
deleted file mode 100644
index e69de29..0000000
--- a/linux/network/interface/bond_ovs_dvr.yml
+++ /dev/null
diff --git a/linux/network/interface/bond_vlan_dvr.yml b/linux/network/interface/bond_vlan_dvr.yml
deleted file mode 100644
index e69de29..0000000
--- a/linux/network/interface/bond_vlan_dvr.yml
+++ /dev/null
diff --git a/nginx/server/proxy/openstack/designate.yml b/nginx/server/proxy/openstack/designate.yml
index 2b8ffce..29bc390 100644
--- a/nginx/server/proxy/openstack/designate.yml
+++ b/nginx/server/proxy/openstack/designate.yml
@@ -1,4 +1,4 @@
- parameters:
+parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
nginx:
diff --git a/nginx/server/proxy/openstack/murano.yml b/nginx/server/proxy/openstack/murano.yml
index a93b07e..06b8c1a 100644
--- a/nginx/server/proxy/openstack/murano.yml
+++ b/nginx/server/proxy/openstack/murano.yml
@@ -1,4 +1,4 @@
- parameters:
+parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
nginx:
diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index 1faea32..5537b75 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,4 +1,4 @@
-paramaters:
+parameters:
telegraf:
agent:
output: