Merge "Add missing repo for elasticsearch-curator"
diff --git a/jenkins/client/job/deploy/update/config.yml b/jenkins/client/job/deploy/update/config.yml
index 9beabfb..e956736 100644
--- a/jenkins/client/job/deploy/update/config.yml
+++ b/jenkins/client/job/deploy/update/config.yml
@@ -42,4 +42,7 @@
TARGET_BATCH_LIVE:
type: string
description: Batch size for the complete live config changes on all nodes, empty string means apply to all targetted nodes.
-
+ PULL_MODEL:
+ type: boolean
+ default: 'true'
+ description: Pull the latest reclass cluster model before applying the states.
diff --git a/jenkins/client/node.yml b/jenkins/client/node.yml
index 321951a..e5e4d3b 100644
--- a/jenkins/client/node.yml
+++ b/jenkins/client/node.yml
@@ -7,6 +7,8 @@
master:
node_mode: Exclusive
remote_home: /var/lib/jenkins
+ labels:
+ - python
launcher:
type: master
slave01:
diff --git a/reclass/storage/system/openstack_compute_multi.yml b/reclass/storage/system/openstack_compute_multi.yml
index 86092db..b319fa6 100644
--- a/reclass/storage/system/openstack_compute_multi.yml
+++ b/reclass/storage/system/openstack_compute_multi.yml
@@ -2,6 +2,8 @@
_param:
openstack_compute_node01_hostname: cmp01
openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_address: 172.16.10.105
+ openstack_compute_node02_address: 172.16.10.106
reclass:
storage:
node:
@@ -13,7 +15,7 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.105
+ single_address: ${_param:openstack_compute_node01_address}
openstack_compute_node02:
name: ${_param:openstack_compute_node02_hostname}
domain: ${_param:cluster_domain}
@@ -22,4 +24,4 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.106
+ single_address: ${_param:openstack_compute_node02_address}
diff --git a/reclass/storage/system/openstack_compute_single.yml b/reclass/storage/system/openstack_compute_single.yml
index 215c0e6..1b16352 100644
--- a/reclass/storage/system/openstack_compute_single.yml
+++ b/reclass/storage/system/openstack_compute_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_compute_node01_hostname: cmp01
+ openstack_compute_node01_address: 172.16.10.105
reclass:
storage:
node:
@@ -12,4 +13,4 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.105
+ single_address: ${_param:openstack_compute_node01_address}