Merge "[octavia] Define DB/AMQP service endpoints"
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
index 0214da7..4d784d2 100644
--- a/jenkins/client/job/deploy/kqueen.yml
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -52,7 +52,7 @@
default: "eu-central-1"
AWS_API_CREDENTIALS:
type: string
- default: "aws-credentials"
+ default: "kqueen-aws"
AWS_SSH_KEY:
type: string
default: "jenkins-mk"
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 36e1dc0..0fdbbfe 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -9,7 +9,7 @@
discard:
build:
keep_num: 50
- concurrent: false
+ concurrent: true
scm:
type: git
url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 78e91a0..864b031 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -5,8 +5,11 @@
- 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_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.2.2
+ aptly_server_hostname: apt
+ kubernetes_netchecker_agent_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-server:v1.2.2
kubernetes:
master:
container: false
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 684af64..2b67bd5 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -2,8 +2,11 @@
- 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_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.2.2
+ aptly_server_hostname: apt
+ kubernetes_netchecker_agent_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-server:v1.2.2
kubernetes:
master:
container: false
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index d223d57..dfcfbcc 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -4,12 +4,20 @@
parameters:
_param:
# component docker images
- kubernetes_calico_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_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
+ kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:v2.6.1
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.2.0
+ #Local versions of images
+ aptly_server_hostname: apt
+ kubernetes_calico_calicoctl_image_local: ${_param:aptly_server_hostname}:5000/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image_local: ${_param:aptly_server_hostname}:5000/node:v2.6.1
+ kubernetes_calico_cni_image_local: ${_param:aptly_server_hostname}:5000/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image_local: ${_param:aptly_server_hostname}:5000/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image_local: ${_param:aptly_server_hostname}:5000/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image_local: ${_param:aptly_server_hostname}:5000/contrail-network-controller:v1.2.0
kubernetes:
pool:
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index d6282c3..fd17078 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -4,12 +4,20 @@
parameters:
_param:
# component docker images
- kubernetes_calico_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_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
+ kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:v2.6.1
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.2.0
+ #Local versions of images
+ aptly_server_hostname: apt
+ kubernetes_calico_calicoctl_image_local: ${_param:aptly_server_hostname}:5000/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image_local: ${_param:aptly_server_hostname}:5000/node:v2.6.1
+ kubernetes_calico_cni_image_local: ${_param:aptly_server_hostname}:5000/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image_local: ${_param:aptly_server_hostname}:5000/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image_local: ${_param:aptly_server_hostname}:5000/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image_local: ${_param:aptly_server_hostname}:5000/contrail-network-controller:v1.2.0
kubernetes:
pool:
diff --git a/linux/system/banner.yml b/linux/system/banner.yml
new file mode 100644
index 0000000..173a044
--- /dev/null
+++ b/linux/system/banner.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ banner_company_name: COMPANY_NAME_HERE
+ linux:
+ system:
+ banner:
+ enabled: true
+ contents: |
+ =================================== WARNING ====================================
+ You have accessed a computer managed by ${_param:banner_company_name}.
+ You are required to have authorisation from ${_param:banner_company_name}
+ before you proceed and you are strictly limited to use set out within that
+ authorisation. Unauthorised access to or misuse of this system is prohibited
+ and constitutes an offence under the Computer Misuse Act 1990.
+ If you disclose any information obtained through this system without authority
+ ${_param:banner_company_name} may take legal action against you.
+ ================================================================================
diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml
index dae70ff..4429a82 100644
--- a/linux/system/single/init.yml
+++ b/linux/system/single/init.yml
@@ -1,6 +1,7 @@
classes:
- service.linux.system
- service.salt.minion.master
+- system.linux.system.banner
- system.openssh.server.single
- system.ntp.client.single
parameters:
diff --git a/openssh/server/team/members/ikolodyazhny.yml b/openssh/server/team/members/ikolodyazhny.yml
new file mode 100644
index 0000000..1d9a40e
--- /dev/null
+++ b/openssh/server/team/members/ikolodyazhny.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ ikolodyazhny:
+ enabled: true
+ name: ikolodyazhny
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Ivan Kolodyazhny
+ home: /home/ikolodyazhny
+ email: ikolodyazhny@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ ikolodyazhny:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyzhJRhNTqFXr6i21Jel+AFEM4bp6ExFkydkTQfF6OPBQBzDhUjxHac/6wrsmG906gMszjym0riJDh4EWQ0pj162hXBz5hdcmyKxBPC6NbhJU4NjsSpwcPB7fx/OsyWXGcvWUYMUuRv86QS5hwLleY+Z2KoJlnAwe+h6pMT5IG/JvwHg6A1Z6l24DZdpkXqhdeupM6Ot+ODRAsPvMKgy9DxVfs+DaFGtQn0dPYHGa24qoNf56kRQ2DLSJQe9n6LkW41NXYgvO21fSml7vsGAHTAjDj3ZqwlNZX28ti9Bkd0iXe1UPYkoMuLWxhAq25XMvPdyOBYYnyfHyamJqSHGz/Q==
+ user: ${linux:system:user:ikolodyazhny}
diff --git a/openssh/server/team/members/sburns.yml b/openssh/server/team/members/sburns.yml
new file mode 100644
index 0000000..901aa95
--- /dev/null
+++ b/openssh/server/team/members/sburns.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ sburns:
+ enabled: true
+ name: sburns
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Seamus Burns
+ home: /home/sburns
+ email: sburns@mirantis.com
+ openssh:
+ server:
+ user:
+ sburns:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq9VAEV+CSdEazCqkYCuzSXPKD96+zgyYllFLMMiAeeqwdWT+JGXf6cIgGV5hBUwBeOc8wncWqdQG93/PYDcgeCDVcJlAmd5DeIOtjdrVk0dSK93AAwxsDkJrStOh/xlbvbv25+kytfq91tqL4XWw0myu3bHxbhpah4ERA/Iu+olI6Rz1qs8/X9+pSeZBkhJt6iCVvAaHzLjOmDb4Mg5EfXCcc30bNpmp7wTSQp5x57CE9vkhVEMO7WlPBNHugdLsiYFUj1DZyyO+/ED8FvNi7dhrxgL9USV4ld2nHCZg7f1987W3H2t3gzbhbNJUKdPdJnZBR1orrBkTGgqOnP5x1 sburns@mirantis.com
+ user: ${linux:system:user:sburns}
diff --git a/openssh/server/team/members/yisakov.yml b/openssh/server/team/members/yisakov.yml
new file mode 100644
index 0000000..bfea7f2
--- /dev/null
+++ b/openssh/server/team/members/yisakov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ yisakov:
+ enabled: true
+ name: yisakov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Yaroslav Isakov
+ home: /home/yisakov
+ email: yisakov@mirantis.com
+ openssh:
+ server:
+ user:
+ yisakov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeNzT/yP8yYEZNv8C0EUhWuGYyXSs2ch0bSw1K/rD0VMhFwwHa5lvHEH163xypICr/yA9FjJNy01flwEq3us87gsNvPRbJQ3CoYj21YVksSm2I6gGMYZWM3pgs6xjVhebfrGdzhKbi9IC5hv66740hmI4T0G6hjzCGZYq0P4LLWkc5dXegrJgSMQGP1v2EP2Se2UJvTr+8M4UVQF49P+H+nnjazKYhArJAf4swPc9i2GiiWrM5Fc5HGdANjs8Ee37VZjrWD06QCw6UwvnX20G3nkKVduvGRrSLvsD4VJNdhcz/b4rH9JAPuEW0KwhmpRIZ8m7Gg/6VFcNNYeieK1jP yar@yisakov-lpt
+ user: ${linux:system:user:yisakov}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 12ef0c6..89870b0 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -5,6 +5,7 @@
- system.openssh.server.team.members.mkarpin
- system.openssh.server.team.members.iudovichenko
- system.openssh.server.team.members.vdrok
+- system.openssh.server.team.members.ikolodyazhny
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 9de3a31..a704e04 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -13,6 +13,8 @@
- system.openssh.server.team.members.sflorczak
- system.openssh.server.team.members.alugovoi
- system.openssh.server.team.members.tjaroszyk
+- system.openssh.server.team.members.sburns
+- system.openssh.server.team.members.yisakov
parameters:
_param:
linux_system_user_sudo: true