Merge "define ssl support for hce dependencies"
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index ebf3b21..c908e5c 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -114,6 +114,18 @@
os_version: ocata
branch: stable/ocata
# Trusty
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: trusty
+ os_version: pike
+ branch: stable/pike
+ # Xenial
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: xenial
+ os_version: pike
+ branch: stable/pike
+ # Trusty
- name: horizon-jenkins-dashboard
os: ubuntu
dist: trusty
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
index 4d784d2..de05504 100644
--- a/jenkins/client/job/deploy/kqueen.yml
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -49,7 +49,7 @@
# aws api
AWS_STACK_REGION:
type: string
- default: "eu-central-1"
+ default: "us-west-2"
AWS_API_CREDENTIALS:
type: string
default: "kqueen-aws"
diff --git a/jenkins/client/job/git-mirrors/upstream/models.yml b/jenkins/client/job/git-mirrors/upstream/models.yml
index 9a16673..d64c2e4 100644
--- a/jenkins/client/job/git-mirrors/upstream/models.yml
+++ b/jenkins/client/job/git-mirrors/upstream/models.yml
@@ -4,9 +4,9 @@
_param:
jenkins_git_mirror_upstream_jobs:
- name: kubernetes-aws-model
- downstream: mk/kubernetes-aws-model
+ downstream: kubernetes/kubernetes-aws-model
upstream: "git@github.com:Mirantis/kubernetes-aws-model"
- branches: master
+ branches: allinone,master
- name: ceph-ha-model
downstream: ceph/ceph-ha-model
upstream: "git@github.com:Mirantis/ceph-ha-model"
diff --git a/keepalived/cluster/instance/stacklight_control_vip.yml b/keepalived/cluster/instance/stacklight_control_vip.yml
new file mode 100644
index 0000000..15e507b
--- /dev/null
+++ b/keepalived/cluster/instance/stacklight_control_vip.yml
@@ -0,0 +1,31 @@
+# This instance is needed for the case, where on control node the GlusterFS is deployed with keepalived and
+# a `remote_agent` from `Stacklight` sends its queries to the control's VIP to gather the GlusterFS data.
+# In case of `glusterd` process failure, the VIP should be moved to another node, to prevent `remote_agent` from failing.
+# In addition, check for haproxy process too, as on its failure VIP should be also moved to another node.
+classes:
+- service.keepalived.support
+parameters:
+ _param:
+ keepalived_stacklight_control_vip_address: ${_param:keepalived_vip_address}
+ keepalived_stacklight_control_vip_password: ${_param:keepalived_vip_password}
+ keepalived_stacklight_control_vip_interface: ${_param:keepalived_vip_interface}
+ keepalived_stacklight_control_vip_priority: ${_param:keepalived_vip_priority}
+ keepalived_stacklight_control_vip_virtual_router_id: ${_param:keepalived_vip_virtual_router_id}
+ keepalived_stacklight_control_vip_vrrp_check_script_content: "pidof glusterd && pidof haproxy"
+ keepalived:
+ cluster:
+ vrrp_scripts:
+ vrrp_check:
+ content: ${_param:keepalived_stacklight_control_vip_vrrp_check_script_content}
+ interval: 10
+ rise: 1
+ fall: 1
+ enabled: true
+ instance:
+ VIP:
+ address: ${_param:keepalived_stacklight_control_vip_address}
+ password: ${_param:keepalived_stacklight_control_vip_password}
+ interface: ${_param:keepalived_stacklight_control_vip_interface}
+ priority: ${_param:keepalived_stacklight_control_vip_priority}
+ virtual_router_id: ${_param:keepalived_stacklight_control_vip_virtual_router_id}
+ track_script: vrrp_check
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 62a1d4b..dcc3ac1 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -11,9 +11,9 @@
kubernetes_contrail_network_controller_repo: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration
# component docker images
- kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.1-38-20171010022253
- kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.1
- kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.0-31-20171010012204
+ kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.4
+ kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.9
+ kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.5
kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.11-9
kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
diff --git a/openssh/server/single.yml b/openssh/server/single.yml
index 6ce0209..84f1fe5 100644
--- a/openssh/server/single.yml
+++ b/openssh/server/single.yml
@@ -1,2 +1,7 @@
classes:
- service.openssh.server
+- service.openssh.server.cis
+
+parameters:
+ _param:
+ ssh_banner_company_name: COMPANY_NAME