Merge "Added PRE_BUILD_SCRIPT param to heat resources building"
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 359ab89..235c84c 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -53,6 +53,42 @@
dist: xenial
os_version: ocata
branch: stable/ocata
+ # Trusty
+ - name: horizon-jenkins-dashboard
+ os: ubuntu
+ dist: trusty
+ os_version: liberty
+ branch: stable/liberty
+ # Xenial
+ - name: horizon-jenkins-dashboard
+ os: ubuntu
+ dist: xenial
+ os_version: liberty
+ branch: stable/liberty
+ # Trusty
+ - name: horizon-telemetry-dashboard
+ os: ubuntu
+ dist: trusty
+ os_version: liberty
+ branch: stable/liberty
+ # Xenial
+ - name: horizon-telemetry-dashboard
+ os: ubuntu
+ dist: xenial
+ os_version: liberty
+ branch: stable/liberty
+ # Trusty
+ - name: horizon-telemetry-dashboard
+ os: ubuntu
+ dist: trusty
+ os_version: mitaka
+ branch: stable/mitaka
+ # Xenial
+ - name: horizon-telemetry-dashboard
+ os: ubuntu
+ dist: xenial
+ os_version: mitaka
+ branch: stable/mitaka
template:
discard:
build:
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index af87dcf..a65d440 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -2,3 +2,4 @@
- system.jenkins.client.job.deploy.update.package
- system.jenkins.client.job.deploy.update.config
- system.jenkins.client.job.deploy.update.saltenv
+ - system.jenkins.client.job.deploy.update.upgrade
diff --git a/jenkins/client/job/deploy/update/upgrade.yml b/jenkins/client/job/deploy/update/upgrade.yml
new file mode 100644
index 0000000..81a7b16
--- /dev/null
+++ b/jenkins/client/job/deploy/update/upgrade.yml
@@ -0,0 +1,25 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-upgrade-control:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - upgrade control VMs"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: openstack-control-upgrade.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 967de8c..697ab51 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -29,21 +29,6 @@
COOKIECUTTER_TEMPLATE_PATH:
type: string
default: "./"
- COOKIECUTTER_INSTALL_CICD:
- type: boolean
- default: false
- COOKIECUTTER_INSTALL_CONTRAIL:
- type: boolean
- default: false
- COOKIECUTTER_INSTALL_KUBERNETES:
- type: boolean
- default: false
- COOKIECUTTER_INSTALL_OPENSTACK:
- type: boolean
- default: false
- COOKIECUTTER_INSTALL_STACKLIGHT:
- type: boolean
- default: false
COOKIECUTTER_TEMPLATE_CONTEXT:
type: text
RECLASS_MODEL_URL:
@@ -57,3 +42,5 @@
COMMIT_CHANGES:
type: boolean
default: false
+ EMAIL_ADDRESS:
+ type: string
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
new file mode 100644
index 0000000..5d2a20a
--- /dev/null
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -0,0 +1,26 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.gateway:
+ cpu: 32
+ ram: 65536
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ gtw01:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.gateway
+ gtw02:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.gateway
+ gtw03:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.gateway
diff --git a/salt/control/cluster/openstack_gateway_single.yml b/salt/control/cluster/openstack_gateway_single.yml
index c1a4588..1b30b6c 100644
--- a/salt/control/cluster/openstack_gateway_single.yml
+++ b/salt/control/cluster/openstack_gateway_single.yml
@@ -14,5 +14,5 @@
node:
gtw01:
provider: kvm01.${_param:cluster_domain}
- image: ${_param:salt_control_trusty_image}
+ image: ${_param:salt_control_xenial_image}
size: openstack.gateway