Merge "Add upgrades pillars in system"
diff --git a/apache/server/site/horizon.yml b/apache/server/site/horizon.yml
index 2a3b098..4cf7820 100644
--- a/apache/server/site/horizon.yml
+++ b/apache/server/site/horizon.yml
@@ -3,7 +3,7 @@
apache_ssl:
enabled: false
apache_horizon_ssl: ${_param:apache_ssl}
- apache_horizon_api_address: ${_param:single_address}
+ apache_horizon_api_address: ${_param:horizon_server_bind_address}
apache_horizon_api_host: ${linux:network:fqdn}
apache:
server:
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 2500254..67f8747 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -1,2 +1,39 @@
-# This file will be removed in Q3
-# jobs was moved into salt-models/infra repo
+parameters:
+ jenkins:
+ client:
+ job_template:
+ generate-salt-model:
+ name: generate-salt-model-{{cookiecutter_template}}
+ param:
+ cookiecutter_template:
+ - separated-products
+ template:
+ type: workflow-scm
+ concurrent: true
+ discard:
+ build:
+ keep_days: 1
+ artifact:
+ keep_days: 1
+ display_name: "Generate reclass cluster {{cookiecutter_template}}"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: generate-cookiecutter-products.groovy
+ param:
+ # Cookiecutter
+ COOKIECUTTER_TEMPLATE_CONTEXT:
+ type: text
+ # Other
+ EMAIL_ADDRESS:
+ type: string
+ TEST_MODEL:
+ type: boolean
+ default: true
+ DISTRIB_REVISION:
+ type: string
+ default: 'proposed'
+ description: |-
+ "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
diff --git a/nginx/server/proxy/openstack_web.yml b/nginx/server/proxy/openstack_web.yml
index a9a4894..2de6606 100644
--- a/nginx/server/proxy/openstack_web.yml
+++ b/nginx/server/proxy/openstack_web.yml
@@ -14,7 +14,7 @@
type: nginx_proxy
name: openstack_web
proxy:
- host: localhost
+ host: ${_param:horizon_server_bind_address}
# TODO: port must be configurable, as some deployments might have HAproxy over prx nodes
port: 8078
size: 10000m
diff --git a/salt/minion/cert/k8s_client.yml b/salt/minion/cert/k8s_client.yml
index be262b5..5f065d5 100644
--- a/salt/minion/cert/k8s_client.yml
+++ b/salt/minion/cert/k8s_client.yml
@@ -11,7 +11,7 @@
common_name: system:node:${linux:system:name}
organization_name: system:nodes
signing_policy: cert_client
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_control_node01_address},IP:${_param:kubernetes_control_node02_address},IP:${_param:kubernetes_control_node03_address},IP:${_param:kubernetes_internal_api_address}
k8s_proxy:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -20,7 +20,7 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-proxy
signing_policy: cert_client
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_control_node01_address},IP:${_param:kubernetes_control_node02_address},IP:${_param:kubernetes_control_node03_address},IP:${_param:kubernetes_internal_api_address}
k8s_scheduler:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -29,7 +29,7 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-scheduler
signing_policy: cert_client
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_control_node01_address},IP:${_param:kubernetes_control_node02_address},IP:${_param:kubernetes_control_node03_address},IP:${_param:kubernetes_internal_api_address}
k8s_controller_manager:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -38,4 +38,4 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-controller-manager
signing_policy: cert_client
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_control_node01_address},IP:${_param:kubernetes_control_node02_address},IP:${_param:kubernetes_control_node03_address},IP:${_param:kubernetes_internal_api_address}
diff --git a/salt/minion/cert/k8s_client_single.yml b/salt/minion/cert/k8s_client_single.yml
index e9c7d79..a4302a3 100644
--- a/salt/minion/cert/k8s_client_single.yml
+++ b/salt/minion/cert/k8s_client_single.yml
@@ -11,7 +11,7 @@
common_name: system:node:${linux:system:name}
organization_name: system:nodes
signing_policy: cert_client
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_internal_api_address}
k8s_proxy:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -20,7 +20,7 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-proxy
signing_policy: cert_client
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_internal_api_address}
k8s_scheduler:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -29,7 +29,7 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-scheduler
signing_policy: cert_client
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_internal_api_address}
k8s_controller_manager:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
@@ -38,4 +38,4 @@
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
common_name: system:kube-controller-manager
signing_policy: cert_client
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_internal_api_address}
diff --git a/salt/minion/cert/k8s_server.yml b/salt/minion/cert/k8s_server.yml
index 603d369..025f3ae 100644
--- a/salt/minion/cert/k8s_server.yml
+++ b/salt/minion/cert/k8s_server.yml
@@ -10,4 +10,4 @@
cert_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.crt
all_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.pem
signing_policy: cert_server
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address},DNS:kubernetes.default,DNS:kubernetes.default.svc
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_control_node01_address},IP:${_param:kubernetes_control_node02_address},IP:${_param:kubernetes_control_node03_address},IP:${_param:kubernetes_internal_api_address},DNS:kubernetes.default,DNS:kubernetes.default.svc
diff --git a/salt/minion/cert/k8s_server_single.yml b/salt/minion/cert/k8s_server_single.yml
index 33637e4..2cc5caa 100644
--- a/salt/minion/cert/k8s_server_single.yml
+++ b/salt/minion/cert/k8s_server_single.yml
@@ -10,4 +10,4 @@
cert_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.crt
all_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.pem
signing_policy: cert_server
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ alternative_names: IP:${_param:kubernetes_control_address},IP:${_param:kubernetes_internal_api_address}