Merge "[FUN] Fixes a fature update note"
diff --git a/ceph/radosgw/single.yml b/ceph/radosgw/single.yml
index 31bdc7d..d6b9bf7 100644
--- a/ceph/radosgw/single.yml
+++ b/ceph/radosgw/single.yml
@@ -1,3 +1,4 @@
+# LEGACY - use rgw.cluster or rgw.single instead
parameters:
_param:
radosgw_keyring_path: /etc/ceph/ceph.client.radosgw.keyring
diff --git a/ceph/rgw/cluster.yml b/ceph/rgw/cluster.yml
new file mode 100644
index 0000000..fbee1fc
--- /dev/null
+++ b/ceph/rgw/cluster.yml
@@ -0,0 +1,7 @@
+classes:
+- system.haproxy.proxy.single
+- system.haproxy.proxy.listen.radosgw
+- system.linux.system.repo.ceph
+- system.linux.system.repo.ubuntu
+- service.keepalived.cluster.single
+- service.ceph.radosgw.cluster
diff --git a/ceph/rgw/keystone.yml b/ceph/rgw/keystone.yml
new file mode 100644
index 0000000..4340d62
--- /dev/null
+++ b/ceph/rgw/keystone.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ ceph_radosgw_keystone_host: 127.0.0.1
+ ceph_radosgw_keystone_user: admin
+ ceph_radosgw_keystone_api_version: 3
+ ceph_radosgw_keystone_project: admin
+ ceph_radosgw_keystone_domain: default
+ ceph_radosgw_keystone_port: 5000
+ ceph:
+ radosgw:
+ identity:
+ engine: keystone
+ api_version: ${_param:ceph_radosgw_keystone_api_version}
+ host: ${_param:ceph_radosgw_keystone_host}
+ port: ${_param:ceph_radosgw_keystone_port}
+ user: ${_param:ceph_radosgw_keystone_user}
+ password: ${_param:ceph_radosgw_keystone_password}
+ tenant: ${_param:ceph_radosgw_keystone_project}
+ project: ${_param:ceph_radosgw_keystone_project}
+ domain: ${_param:ceph_radosgw_keystone_domain}
diff --git a/ceph/rgw/single.yml b/ceph/rgw/single.yml
new file mode 100644
index 0000000..4dba033
--- /dev/null
+++ b/ceph/rgw/single.yml
@@ -0,0 +1,4 @@
+classes:
+- system.linux.system.repo.ceph
+- system.linux.system.repo.ubuntu
+- service.ceph.radosgw.single
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
index 06dc5eb..e4f2ba4 100644
--- a/jenkins/client/job/ceph/init.yml
+++ b/jenkins/client/job/ceph/init.yml
@@ -1,3 +1,2 @@
classes:
- system.jenkins.client.job.ceph.remove-osd
-- system.jenkins.client.job.ceph.weights
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index 448318a..af3b9ed 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -34,6 +34,7 @@
ADMIN_HOST:
type: string
description: Host with admin keyring and access to cluster management
+ default: 'cmn01*'
CLUSTER_FLAGS:
type: string
description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
diff --git a/jenkins/client/job/ceph/weights.yml b/jenkins/client/job/ceph/weights.yml
deleted file mode 100644
index 776e16f..0000000
--- a/jenkins/client/job/ceph/weights.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- ceph-enforce-weights:
- type: workflow-scm
- concurrent: true
- display_name: "Ceph - enforce OSD weights"
- discard:
- build:
- keep_num: 50
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "gerrit"
- script: ceph-enforce-weights.groovy
- param:
- # general parameters
- SALT_MASTER_URL:
- type: string
- description: URL of Salt master
- default: "http://${_param:salt_master_host}:6969"
- SALT_MASTER_CREDENTIALS:
- type: string
- description: Credentials for login to Salt API
- default: salt
- ADMIN_HOST:
- type: string
- description: Host with admin keyring and access to cluster management
diff --git a/nginx/server/proxy/ceph_radosgw.yml b/nginx/server/proxy/ceph_radosgw.yml
index fe90201..2601849 100644
--- a/nginx/server/proxy/ceph_radosgw.yml
+++ b/nginx/server/proxy/ceph_radosgw.yml
@@ -1,15 +1,23 @@
parameters:
_param:
nginx_proxy_radosgw_host: ${_param:cluster_public_host}
+ nginx_proxy_radosgw_port: 8080
+ nginx_proxy_radosgw_service_host: ${_param:ceph_rgw_address}
+ nginx_proxy_radosgw_service_port: 8080
nginx:
server:
enabled: true
site:
ceph_radosgw:
enabled: true
- type: ceph
+ type: nginx_proxy
name: ceph_radosgw
+ proxy:
+ host: ${_param:nginx_proxy_radosgw_service_host}
+ port: ${_param:nginx_proxy_radosgw_service_port}
+ protocol: http
host:
name: ${_param:nginx_proxy_radosgw_host}
- port: 8080
- ssl: ${_param:nginx_proxy_ssl}
\ No newline at end of file
+ port: ${_param:nginx_proxy_radosgw_port}
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/opencontrail/client/resource/global_vrouter_config.yml b/opencontrail/client/resource/global_vrouter_config.yml
index 0d86703..15bf76e 100644
--- a/opencontrail/client/resource/global_vrouter_config.yml
+++ b/opencontrail/client/resource/global_vrouter_config.yml
@@ -8,4 +8,4 @@
vxlan_vn_id_mode: automatic
fq_names:
- 'default-global-system-config'
- - 'default-global-vrouter-config
+ - 'default-global-vrouter-config'
diff --git a/reclass/storage/system/ceph_mon_cluster.yml b/reclass/storage/system/ceph_mon_cluster.yml
index d54d767..91b76f6 100644
--- a/reclass/storage/system/ceph_mon_cluster.yml
+++ b/reclass/storage/system/ceph_mon_cluster.yml
@@ -12,7 +12,7 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.ceph.mon
- - cluster.${_param:cluster_name}.ceph.mon_init
+ - cluster.${_param:cluster_name}.ceph.setup
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:ceph_mon_system_codename}
diff --git a/reclass/storage/system/ceph_rgw_cluster.yml b/reclass/storage/system/ceph_rgw_cluster.yml
new file mode 100644
index 0000000..46d8a59
--- /dev/null
+++ b/reclass/storage/system/ceph_rgw_cluster.yml
@@ -0,0 +1,39 @@
+parameters:
+ _param:
+ ceph_rgw_node01_hostname: rgw01
+ ceph_rgw_node02_hostname: rgw02
+ ceph_rgw_node03_hostname: rgw03
+ ceph_rgw_system_codename: xenial
+ reclass:
+ storage:
+ node:
+ ceph_rgw_node01:
+ name: ${_param:ceph_rgw_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.rgw
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_rgw_system_codename}
+ single_address: ${_param:ceph_rgw_node01_address}
+ keepalived_vip_priority: 103
+ ceph_rgw_node02:
+ name: ${_param:ceph_rgw_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.rgw
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_rgw_system_codename}
+ single_address: ${_param:ceph_rgw_node02_address}
+ keepalived_vip_priority: 102
+ ceph_rgw_node03:
+ name: ${_param:ceph_rgw_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.rgw
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_rgw_system_codename}
+ single_address: ${_param:ceph_rgw_node03_address}
+ keepalived_vip_priority: 101
diff --git a/salt/control/cluster/ceph_rgw_cluster.yml b/salt/control/cluster/ceph_rgw_cluster.yml
new file mode 100644
index 0000000..6f24819
--- /dev/null
+++ b/salt/control/cluster/ceph_rgw_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ ceph.rgw:
+ cpu: 16
+ ram: 32768
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ rgw01:
+ name: ${_param:ceph_rgw_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.rgw
+ rgw02:
+ name: ${_param:ceph_rgw_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.rgw
+ rgw03:
+ name: ${_param:ceph_rgw_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.rgw
\ No newline at end of file