Merge "Add dkalashnik to team members"
diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 4bbc22b..12bfc0c 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -3,10 +3,11 @@
parameters:
_param:
docker_gwbridge_subnet: 10.20.0.0/16
+ docker_swarm_master_port: 2377
docker:
swarm:
role: manager
advertise_addr: ${_param:single_address}
master:
host: ${_param:cluster_node01_address}
- port: 2377
+ port: ${_param:docker_swarm_master_port}
diff --git a/docker/swarm/worker.yml b/docker/swarm/worker.yml
index 643b207..4bed790 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -3,9 +3,11 @@
parameters:
_param:
docker_gwbridge_subnet: 10.20.0.0/16
+ docker_swarm_master_port: 2377
docker:
swarm:
role: worker
advertise_addr: ${_param:single_address}
master:
host: ${_param:cluster_node01_address}
+ port: ${_param:docker_swarm_master_port}
diff --git a/haproxy/proxy/listen/openstack/nova.yml b/haproxy/proxy/listen/openstack/nova.yml
index 3865a82..efffee0 100644
--- a/haproxy/proxy/listen/openstack/nova.yml
+++ b/haproxy/proxy/listen/openstack/nova.yml
@@ -2,26 +2,6 @@
haproxy:
proxy:
listen:
- nova_ec2_api:
- type: general-service
- service_name: nova
- check: false
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8773
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8773
- params: check
- - name: ctl02
- host: ${_param:cluster_node02_address}
- port: 8773
- params: check
- - name: ctl03
- host: ${_param:cluster_node03_address}
- port: 8773
- params: check
nova_api:
type: openstack-service
service_name: nova
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index a4e7fc0..55a9ef0 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -29,7 +29,7 @@
description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
TARGET_PACKAGES:
type: string
- description: Space delimited list of packages to be updates [package1=version package2=version], empty string means all updating all packages to the latest version.
+ description: Space delimited list of packages to be updated, empty string means updating all packages to the latest version e.g. [package1=version package2=version] or [package1 package2].
TARGET_SUBSET_TEST:
type: string
description: Number of nodes to list package updates, empty string means all targetted nodes.
diff --git a/linux/system/repo/ceph.yml b/linux/system/repo/ceph.yml
new file mode 100644
index 0000000..ccf63d7
--- /dev/null
+++ b/linux/system/repo/ceph.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ linux_repo_ceph_component: jewel
+ linux_repo_ceph_mirror: download
+ linux:
+ system:
+ repo:
+ ceph:
+ source: "deb [arch=amd64] https://${_param:linux_repo_ceph_mirror}.ceph.com/debian-${_param:linux_repo_ceph_component} ${_param:linux_system_codename} main"
+ architectures: amd64
+ key_url: "https://${_param:linux_repo_ceph_mirror}.ceph.com/keys/release.asc"
diff --git a/reclass/storage/system/ceph_monitor_cluster.yml b/reclass/storage/system/ceph_monitor_cluster.yml
new file mode 100644
index 0000000..ca7e7ff
--- /dev/null
+++ b/reclass/storage/system/ceph_monitor_cluster.yml
@@ -0,0 +1,38 @@
+parameters:
+ _param:
+ ceph_monitor_node01_hostname: cmn01
+ ceph_monitor_node02_hostname: cmn02
+ ceph_monitor_node03_hostname: cmn03
+ reclass:
+ storage:
+ node:
+ ceph_monitor_node01:
+ name: ${_param:ceph_monitor_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.monitor
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_monitor_node01_address}
+ keepalived_vip_priority: 103
+ ceph_monitor_node02:
+ name: ${_param:ceph_monitor_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.monitor
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_monitor_node02_address}
+ keepalived_vip_priority: 102
+ ceph_monitor_node03:
+ name: ${_param:ceph_monitor_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.monitor
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_monitor_node03_address}
+ keepalived_vip_priority: 101