Merge "Fix rundeck and devops-portal image building"
diff --git a/cinder/control/backend/solidfire.yml b/cinder/control/backend/solidfire.yml
new file mode 100644
index 0000000..20d708c
--- /dev/null
+++ b/cinder/control/backend/solidfire.yml
@@ -0,0 +1,14 @@
+parameters:
+ cinder:
+ controller:
+ defaul_volume_type: normal-storage
+ backend:
+ solidfire:
+ engine: solidfire
+ type_name: normal-storage
+ engine: solidfire
+ san_ip: ${_param:san_ip_address}
+ san_login: ${_param:san_login}
+ san_password: ${_param:san_password}
+ clustername: ${_param:san_cluster_name}
+ sf_emulate_512: true
\ No newline at end of file
diff --git a/cinder/volume/backend/solidfire.yml b/cinder/volume/backend/solidfire.yml
new file mode 100644
index 0000000..3a38e03
--- /dev/null
+++ b/cinder/volume/backend/solidfire.yml
@@ -0,0 +1,15 @@
+parameters:
+ cinder:
+ volume:
+ enabled: true
+ default_volume_type: normal_storage
+ backend:
+ solidfire:
+ engine: solidfire
+ type_name: normal-storage
+ engine: solidfire
+ san_ip: ${_param:san_ip_address}
+ san_login: ${_param:san_login}
+ san_password: ${_param:san_password}
+ clustername: ${_param:san_cluster_name}
+ sf_emulate_512: true
diff --git a/heka/log_collector/output/sensu.yml b/heka/log_collector/output/sensu.yml
index 23085b7..e7bf79d 100644
--- a/heka/log_collector/output/sensu.yml
+++ b/heka/log_collector/output/sensu.yml
@@ -1,2 +1,3 @@
classes:
- service.heka.log_collector.output.sensu
+
diff --git a/heka/log_collector/output/telegraf.yml b/heka/log_collector/output/telegraf.yml
deleted file mode 100644
index f78747f..0000000
--- a/heka/log_collector/output/telegraf.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-- service.heka.log_collector.output.telegraf
diff --git a/heka/remote_collector/output/telegraf.yml b/heka/remote_collector/output/telegraf.yml
deleted file mode 100644
index 5dae2a9..0000000
--- a/heka/remote_collector/output/telegraf.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-classes:
-- service.heka.remote_collector.output.telegraf
-parameters:
- _param:
- remote_collector_telegraf_host: ${_param:telegraf_remote_agent_address}
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index d3deab7..4fe4966 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -6,6 +6,18 @@
name: build-debian-horizon-module-{{name}}-{{os_version}}-{{os}}-{{dist}}
jobs:
# Trusty
+ - name: horizon-avi-panels
+ os: ubuntu
+ dist: trusty
+ os_version: mitaka
+ branch: stable/mitaka
+ # Xenial
+ - name: horizon-avi-panels
+ os: ubuntu
+ dist: xenial
+ os_version: mitaka
+ branch: stable/mitaka
+ # Trusty
- name: horizon-neutron-lbaasv2-panel
os: ubuntu
dist: trusty
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index ab283d0..f21f003 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -4,6 +4,9 @@
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.kubernetes.apiserver
parameters:
+ _param:
+ kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
+ kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes:
master:
container: false
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 5f0dfdc..cc8d8ab 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -1,8 +1,11 @@
classes:
- service.kubernetes.master.single
parameters:
+ _param:
+ kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
+ kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes:
master:
container: false
network:
- engine: calico
\ No newline at end of file
+ engine: calico
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 8295d97..7adb119 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -2,6 +2,13 @@
- service.kubernetes.pool.cluster
- service.docker.host
parameters:
+ _param:
+ # component docker images
+ kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+
kubernetes:
pool:
container: false
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 68e3844..4caaa50 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -2,8 +2,15 @@
- service.kubernetes.pool.single
- service.docker.host
parameters:
+ _param:
+ # component docker images
+ kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+
kubernetes:
pool:
container: false
network:
- engine: calico
\ No newline at end of file
+ engine: calico
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index d10b361..5e92709 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -1,3 +1,5 @@
+classes:
+ - service.opencontrail.compute.cluster
applications:
- opencontrail
parameters:
diff --git a/reclass/storage/system/openstack_gateway_single_octavia.yml b/reclass/storage/system/openstack_gateway_single_octavia.yml
new file mode 100644
index 0000000..f43e6a1
--- /dev/null
+++ b/reclass/storage/system/openstack_gateway_single_octavia.yml
@@ -0,0 +1,9 @@
+classes:
+- system.reclass.storage.system.openstack_gateway_single
+parameters:
+ reclass:
+ storage:
+ node:
+ openstack_gateway_node01:
+ classes:
+ - system.octavia.manager.single
diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index b1266b8..0e836e8 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,4 +1,11 @@
classes:
- service.telegraf.agent
-- service.telegraf.agent.output.prometheus_client
-- service.telegraf.agent.input.http_listener
+parameters:
+ telegraf:
+ agent:
+ output:
+ prometheus_client:
+ bind:
+ address: 0.0.0.0
+ port: 9126
+ engine: prometheus