Merge "Add Gnocchi aggregation and incoming ceph storage"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index fb6839b..db6b39b 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -1,5 +1,6 @@
classes:
- service.aodh.server.cluster
+- system.salt.minion.cert.mysql.clients.openstack.aodh
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.aodh
- system.keepalived.cluster.instance.openstack_telemetry_vip
@@ -8,6 +9,14 @@
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
+ linux:
+ system:
+ cron:
+ user:
+ aodh:
+ enabled: true
aodh:
server:
enabled: true
@@ -26,6 +35,13 @@
name: aodh
user: aodh
password: ${_param:mysql_aodh_password}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_aodh_ssl_ca_file}
+ key_file: ${_param:mysql_aodh_client_ssl_key_file}
+ cert_file: ${_param:mysql_aodh_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
bind:
host: ${_param:cluster_local_address}
port: 8042
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 6fec2a6..f20195f 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -1,12 +1,29 @@
classes:
- service.aodh.server.single
+- system.salt.minion.cert.mysql.clients.openstack.aodh
parameters:
_param:
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
+ linux:
+ system:
+ cron:
+ user:
+ aodh:
+ enabled: true
aodh:
server:
+ database:
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_aodh_ssl_ca_file}
+ key_file: ${_param:mysql_aodh_client_ssl_key_file}
+ cert_file: ${_param:mysql_aodh_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
ttl: ${_param:aodh_alarm_history_ttl}
role: ${_param:openstack_node_role}
region: ${_param:openstack_region}
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 81ee5af..972c05d 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -11,3 +11,9 @@
protocol: ${_param:cluster_internal_protocol}
database:
host: ${_param:openstack_database_address}
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index b115e79..207957f 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -8,3 +8,9 @@
role: ${_param:openstack_node_role}
identity:
protocol: ${_param:internal_protocol}
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
diff --git a/bind/server/cluster.yml b/bind/server/cluster.yml
new file mode 100644
index 0000000..1f9e943
--- /dev/null
+++ b/bind/server/cluster.yml
@@ -0,0 +1,37 @@
+classes:
+- service.bind.server.single
+parameters:
+ _param:
+ mgmt_allow_node01_address: ${_param:openstack_control_node01_address}
+ mgmt_allow_node02_address: ${_param:openstack_control_node02_address}
+ mgmt_allow_node03_address: ${_param:openstack_control_node03_address}
+ bind:
+ server:
+ key:
+ mgmt:
+ secret: "${_param:bind9_mgmt_rndc_key}"
+ algorithm: "${_param:bind9_mgmt_rndc_algorithm}"
+ allow_new_zones: true
+ query: true
+ # for local server management /etc/bind/rndc.key
+ # generated by bind9 package postinstall script
+ # will be used
+ control:
+ local:
+ enabled: true
+ bind:
+ address: 127.0.0.1
+ port: 953
+ allow:
+ - 127.0.0.1
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:mgmt_allow_node01_address}
+ - ${_param:mgmt_allow_node02_address}
+ - ${_param:mgmt_allow_node03_address}
+ keys:
+ - mgmt
\ No newline at end of file
diff --git a/cassandra/backup/server/single.yml b/cassandra/backup/server/single.yml
index ffb43cf..c441529 100644
--- a/cassandra/backup/server/single.yml
+++ b/cassandra/backup/server/single.yml
@@ -3,6 +3,12 @@
parameters:
_param:
cassandra_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN
+ linux:
+ system:
+ cron:
+ user:
+ cassandra:
+ enabled: true
cassandra:
backup:
server:
diff --git a/ceph/backup/server/single.yml b/ceph/backup/server/single.yml
index ca36297..896a6cc 100644
--- a/ceph/backup/server/single.yml
+++ b/ceph/backup/server/single.yml
@@ -1,2 +1,9 @@
classes:
- service.ceph.backup.server
+parameters:
+ linux:
+ system:
+ cron:
+ user:
+ ceph:
+ enabled: true
diff --git a/defaults/init.yml b/defaults/init.yml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/defaults/init.yml
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
index 823d52d..bbce637 100644
--- a/designate/server/backend/bind.yml
+++ b/designate/server/backend/bind.yml
@@ -38,4 +38,4 @@
key:
designate:
secret: "${_param:designate_bind9_rndc_key}"
- algorithm: "${_param:designate_bind9_rndc_algorithm}"
+ algorithm: "${_param:designate_bind9_rndc_algorithm}"
\ No newline at end of file
diff --git a/designate/server/backend/pdns.yml b/designate/server/backend/pdns.yml
index 45ad0b7..151ef10 100644
--- a/designate/server/backend/pdns.yml
+++ b/designate/server/backend/pdns.yml
@@ -23,4 +23,4 @@
enabled: true
address: ${_param:single_address}
port: ${_param:powerdns_webserver_port}
- password: ${_param:powerdns_webserver_password}
+ password: ${_param:powerdns_webserver_password}
\ No newline at end of file
diff --git a/designate/server/cluster/bind.yml b/designate/server/cluster/bind.yml
new file mode 100644
index 0000000..39c802b
--- /dev/null
+++ b/designate/server/cluster/bind.yml
@@ -0,0 +1,39 @@
+classes:
+ - system.designate.server.cluster.default
+parameters:
+ _param:
+ designate_bind9_rndc_algorithm: hmac-sha512
+ designate:
+ worker:
+ enabled: true
+ server:
+ backend:
+ bind9:
+ rndc_key: "${_param:designate_bind9_rndc_key}"
+ rndc_algorithm: "${_param:designate_bind9_rndc_algorithm}"
+ pools:
+ default:
+ description: 'default pool'
+ ns_records: ${_param:designate_pool_ns_records}
+ nameservers: ${_param:designate_pool_nameservers}
+ targets:
+ default01:
+ type: bind9
+ description: 'default target01'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_dns_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_dns_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default02:
+ type: bind9
+ description: 'default target02'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_dns_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_dns_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
\ No newline at end of file
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
new file mode 100644
index 0000000..de2eb43
--- /dev/null
+++ b/designate/server/cluster/default.yml
@@ -0,0 +1,59 @@
+classes:
+- service.keepalived.cluster.single
+- service.haproxy.proxy.single
+- system.haproxy.proxy.listen.openstack.designate
+- service.designate.server.cluster
+parameters:
+ _param:
+ designate_admin_api_enabled: false
+ cluster_internal_protocol: 'http'
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
+ designate:
+ _support:
+ sensu:
+ enabled: false
+ server:
+ enabled: true
+ local_bind: true
+ region: ${_param:openstack_region}
+ domain_id: ${_param:designate_domain_id}
+ version: ${_param:designate_version}
+ role: ${_param:openstack_node_role}
+ admin_api:
+ enabled: ${_param:designate_admin_api_enabled}
+ enabled_extensions_admin: quotas
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name:
+ main_database: designate
+ pool_manager: designate_pool_manager
+ user: designate
+ password: ${_param:mysql_designate_password}
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ tenant: service
+ user: designate
+ password: ${_param:keystone_designate_password}
+ protocol: ${_param:cluster_internal_protocol}
+ bind:
+ api:
+ address: ${_param:single_address}
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
\ No newline at end of file
diff --git a/designate/server/cluster/pdns.yml b/designate/server/cluster/pdns.yml
new file mode 100644
index 0000000..7d81f90
--- /dev/null
+++ b/designate/server/cluster/pdns.yml
@@ -0,0 +1,42 @@
+classes:
+ - system.designate.server.cluster.default
+parameters:
+ _param:
+ designate_pool_manager_enabled: true
+ designate_pool_manager_periodic_sync_interval: '120'
+ designate_mdns_address: 0.0.0.0
+ # required for supermasters functionality
+ designate_mdns_port: 53
+ designate:
+ pool_manager:
+ # required for supermasters functionality
+ enabled: ${_param:designate_pool_manager_enabled}
+ periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
+ server:
+ mdns:
+ address: ${_param:designate_mdns_address}
+ port: ${_param:designate_mdns_port}
+ pools:
+ default:
+ description: 'default pool'
+ ns_records: ${_param:designate_pool_ns_records}
+ nameservers: ${_param:designate_pool_nameservers}
+ targets:
+ default:
+ type: pdns4
+ description: 'default target1'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_dns_node01_address}
+ port: 53
+ api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
+ default1:
+ type: pdns4
+ description: 'default target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_dns_node02_address}
+ port: 53
+ api_endpoint: "http://${_param:openstack_dns_node02_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
\ No newline at end of file
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 9f9b18b..06c6a33 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -1,9 +1,12 @@
classes:
- service.designate.server.cluster
+- system.salt.minion.cert.mysql.clients.openstack.designate
parameters:
_param:
designate_admin_api_enabled: false
cluster_internal_protocol: 'http'
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -33,6 +36,13 @@
pool_manager: designate_pool_manager
user: designate
password: ${_param:mysql_designate_password}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_designate_ssl_ca_file}
+ key_file: ${_param:mysql_designate_client_ssl_key_file}
+ cert_file: ${_param:mysql_designate_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
identity:
engine: keystone
host: ${_param:openstack_control_address}
diff --git a/designate/server/single.yml b/designate/server/single.yml
index 683180e..1bb51cb 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -1,9 +1,12 @@
classes:
- service.designate.server.single
+- system.salt.minion.cert.mysql.clients.openstack.designate
parameters:
_param:
designate_admin_api_enabled: false
internal_protocol: 'http'
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -33,6 +36,13 @@
pool_manager: designate_pool_manager
user: designate
password: ${_param:mysql_designate_password}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_designate_ssl_ca_file}
+ key_file: ${_param:mysql_designate_client_ssl_key_file}
+ cert_file: ${_param:mysql_designate_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
identity:
engine: keystone
host: ${_param:single_address}
diff --git a/elasticsearch/server/curator.yml b/elasticsearch/server/curator.yml
index fe7383d..a73ef44 100644
--- a/elasticsearch/server/curator.yml
+++ b/elasticsearch/server/curator.yml
@@ -2,6 +2,12 @@
_param:
elasticsearch_curator_indices_pattern: "^(log|notification)-.*$"
elasticsearch_curator_retention_period: 31
+ linux:
+ system:
+ cron:
+ user:
+ elasticsearch:
+ enabled: true
elasticsearch:
server:
curator:
diff --git a/galera/server/database/ssl/aodh.yml b/galera/server/database/ssl/aodh.yml
new file mode 100644
index 0000000..e68e0fa
--- /dev/null
+++ b/galera/server/database/ssl/aodh.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_aodh_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/ssl/designate.yml b/galera/server/database/ssl/designate.yml
new file mode 100644
index 0000000..d8a7ed8
--- /dev/null
+++ b/galera/server/database/ssl/designate.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_designate_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/ssl/glance.yml b/galera/server/database/ssl/glance.yml
new file mode 100644
index 0000000..99802f8
--- /dev/null
+++ b/galera/server/database/ssl/glance.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_glance_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/ssl/heat.yml b/galera/server/database/ssl/heat.yml
new file mode 100644
index 0000000..567d611
--- /dev/null
+++ b/galera/server/database/ssl/heat.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_heat_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/ssl/keystone.yml b/galera/server/database/ssl/keystone.yml
new file mode 100644
index 0000000..bcaec18
--- /dev/null
+++ b/galera/server/database/ssl/keystone.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_keystone_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/ssl/neutron.yml b/galera/server/database/ssl/neutron.yml
new file mode 100644
index 0000000..c8f3761
--- /dev/null
+++ b/galera/server/database/ssl/neutron.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ mysql_neutron_ssl_option:
+ - SSL: True
\ No newline at end of file
diff --git a/galera/server/database/x509/aodh.yml b/galera/server/database/x509/aodh.yml
new file mode 100644
index 0000000..d90d17e
--- /dev/null
+++ b/galera/server/database/x509/aodh.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_aodh_client_ssl_x509_subject: '/C=cz/CN=mysql-aodh-client/L=Prague/O=Mirantis'
+ mysql_aodh_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_aodh_ssl_option:
+ - SUBJECT: ${_param:mysql_aodh_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_aodh_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/cinder.yml b/galera/server/database/x509/cinder.yml
index 38fd75a..be45c03 100644
--- a/galera/server/database/x509/cinder.yml
+++ b/galera/server/database/x509/cinder.yml
@@ -1,7 +1,7 @@
parameters:
_param:
- mysql_cinder_clietn_ssl_x509_subject: '/C=cz/CN=mysql-cinder-client/L=Prague/O=Mirantis'
- mysql_cinder_clietn_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_cinder_client_ssl_x509_subject: '/C=cz/CN=mysql-cinder-client/L=Prague/O=Mirantis'
+ mysql_cinder_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
mysql_cinder_ssl_option:
- - SUBJECT: ${_param:mysql_cinder_clietn_ssl_x509_subject}
- - ISSUER: ${_param:mysql_cinder_clietn_ssl_x509_issuer}
\ No newline at end of file
+ - SUBJECT: ${_param:mysql_cinder_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_cinder_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/designate.yml b/galera/server/database/x509/designate.yml
new file mode 100644
index 0000000..27e3ae4
--- /dev/null
+++ b/galera/server/database/x509/designate.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_designate_client_ssl_x509_subject: '/C=cz/CN=mysql-designate-client/L=Prague/O=Mirantis'
+ mysql_designate_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_designate_ssl_option:
+ - SUBJECT: ${_param:mysql_designate_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_designate_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/glance.yml b/galera/server/database/x509/glance.yml
new file mode 100644
index 0000000..2fdcea3
--- /dev/null
+++ b/galera/server/database/x509/glance.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_glance_client_ssl_x509_subject: '/C=cz/CN=mysql-glance-client/L=Prague/O=Mirantis'
+ mysql_glance_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_glance_ssl_option:
+ - SUBJECT: ${_param:mysql_glance_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_glance_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/heat.yml b/galera/server/database/x509/heat.yml
new file mode 100644
index 0000000..57dbd5f
--- /dev/null
+++ b/galera/server/database/x509/heat.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_heat_client_ssl_x509_subject: '/C=cz/CN=mysql-heat-client/L=Prague/O=Mirantis'
+ mysql_heat_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_heat_ssl_option:
+ - SUBJECT: ${_param:mysql_heat_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_heat_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/keystone.yml b/galera/server/database/x509/keystone.yml
new file mode 100644
index 0000000..0a790e7
--- /dev/null
+++ b/galera/server/database/x509/keystone.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_keystone_client_ssl_x509_subject: '/C=cz/CN=mysql-keystone-client/L=Prague/O=Mirantis'
+ mysql_keystone_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_keystone_ssl_option:
+ - SUBJECT: ${_param:mysql_keystone_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_keystone_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/galera/server/database/x509/neutron.yml b/galera/server/database/x509/neutron.yml
new file mode 100644
index 0000000..2c07e05
--- /dev/null
+++ b/galera/server/database/x509/neutron.yml
@@ -0,0 +1,7 @@
+parameters:
+ _param:
+ mysql_neutron_client_ssl_x509_subject: '/C=cz/CN=mysql-neutron-client/L=Prague/O=Mirantis'
+ mysql_neutron_client_ssl_x509_issuer: '/C=cz/CN=Salt Master CA/L=Prague/O=Mirantis'
+ mysql_neutron_ssl_option:
+ - SUBJECT: ${_param:mysql_neutron_client_ssl_x509_subject}
+ - ISSUER: ${_param:mysql_neutron_client_ssl_x509_issuer}
\ No newline at end of file
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index e218835..a9181de 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -3,9 +3,17 @@
- service.keepalived.cluster.single
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.glance
+- system.salt.minion.cert.mysql.clients.openstack.glance
parameters:
+ _param:
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
+ cron:
+ user:
+ glance:
+ enabled: true
package:
python-pymysql:
fromrepo: ${_param:openstack_version}
@@ -23,6 +31,13 @@
name: glance
user: glance
password: ${_param:mysql_glance_password}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_glance_ssl_ca_file}
+ key_file: ${_param:mysql_glance_client_ssl_key_file}
+ cert_file: ${_param:mysql_glance_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
registry:
host: ${_param:cluster_vip_address}
port: 9191
diff --git a/glance/control/single.yml b/glance/control/single.yml
index 63e1b48..a036077 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -1,8 +1,16 @@
classes:
- service.glance.control.single
+- system.salt.minion.cert.mysql.clients.openstack.glance
parameters:
+ _param:
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
+ cron:
+ user:
+ glance:
+ enabled: true
package:
python-pymysql:
fromrepo: ${_param:openstack_version}
@@ -12,6 +20,13 @@
role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_glance_ssl_ca_file}
+ key_file: ${_param:mysql_glance_client_ssl_key_file}
+ cert_file: ${_param:mysql_glance_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
identity:
region: ${_param:openstack_region}
show_multiple_locations: True
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index eee2b63..7bbc2ac 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -3,10 +3,13 @@
- service.haproxy.proxy.single
- service.keepalived.cluster.single
- system.haproxy.proxy.listen.openstack.heat
+- system.salt.minion.cert.mysql.clients.openstack.heat
parameters:
_param:
cluster_public_protocol: 'https'
cluster_internal_protocol: 'http'
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -37,6 +40,13 @@
name: heat
user: heat
password: ${_param:mysql_heat_password}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_heat_ssl_ca_file}
+ key_file: ${_param:mysql_heat_client_ssl_key_file}
+ cert_file: ${_param:mysql_heat_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
metadata:
host: ${_param:cluster_public_host}
port: 8000
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 2f28613..208bdf0 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -1,6 +1,10 @@
classes:
- service.heat.server.single
+- system.salt.minion.cert.mysql.clients.openstack.heat
parameters:
+ _param:
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -20,4 +24,12 @@
waitcondition:
protocol: ${_param:cluster_public_protocol}
watch:
- protocol: ${_param:cluster_public_protocol}
\ No newline at end of file
+ protocol: ${_param:cluster_public_protocol}
+ database:
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_heat_ssl_ca_file}
+ key_file: ${_param:mysql_heat_client_ssl_key_file}
+ cert_file: ${_param:mysql_heat_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
\ No newline at end of file
diff --git a/jenkins/client/job/custompatches.yml b/jenkins/client/job/custompatches.yml
deleted file mode 100644
index e7a7eed..0000000
--- a/jenkins/client/job/custompatches.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- custompatches:
- concurrent: true
- discard:
- build:
- keep_num: 20
- display_name: Custom Patches - find and upload to review
- name: custom-patches
- param:
- GERRIT_URI:
- type: string
- default: ''
- description: "Gerrit URI to the projec"
- GERRIT_CREDENTIALS:
- default: mcp-ci-gerrit
- type: string
- description: "Name of creadentials to use when connecting to gerrit"
- TARGET_GERRIT_URI:
- default: ''
- type: string
- description: "Link to the target on gerrit, if not set GERRIT_URI is picked"
- OLD_BRANCH:
- default: ''
- type: string
- description: "Old branch on GERRIT_URI to take patches from, tupically previous release"
- NEW_BRANCH:
- default: ''
- type: string
- description: "New branch to compare with and push patches to, tupically current release"
- DRY_RUN:
- default: 'false'
- type: boolean
- description: "Do not upload custom patches on review, just log them"
- scm:
- script: custompatches.groovy
- type: git
- url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
- credentials: "gerrit"
- type: workflow-scm
-
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 94ccce2..d6a4a5f 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -2,6 +2,12 @@
- system.jenkins.client.job.deploy.lab.deploy
parameters:
_param:
+ heat_stack_zone_job_param:
+ type: string
+ default: "mcp-stacklight"
+ openstack_api_projects_job_param:
+ type: string
+ default: "mcp-stacklight"
jenkins_deploy_jobs:
- stack_name: stacklight_k8s_calico
stack_env: devcloud
diff --git a/jenkins/client/job/docker/cicd/tempest.yml b/jenkins/client/job/docker/cicd/tempest.yml
index 38cc667..e156802 100644
--- a/jenkins/client/job/docker/cicd/tempest.yml
+++ b/jenkins/client/job/docker/cicd/tempest.yml
@@ -22,7 +22,11 @@
"mcp/docker-ci-tempest":
branches:
- master
+ - queens
- pike
+ - ocata
+ - newton
+ - mitaka
event:
patchset:
- created:
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index 4d22797..c26bfce 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -1,4 +1,8 @@
classes:
- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-merge-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-formula-test-pipeline
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-dashboard-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-dashboard-merge-pipeline.yml
new file mode 100644
index 0000000..f6b2350
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-dashboard-merge-pipeline.yml
@@ -0,0 +1,43 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_dashboard_merge_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-dashboard-merge-pipeline
+ display_name: "Kubernetes dashboard merge pipeline"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-dashboard-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**mcp**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ change:
+ - merged
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+ KUBE_PROD_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_prod_docker_registry}
+ description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-dashboard-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-dashboard-test-pipeline.yml
new file mode 100644
index 0000000..ebb4692
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-dashboard-test-pipeline.yml
@@ -0,0 +1,48 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_dashboard_test_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-dashboard-test-pipeline
+ display_name: "Kubernetes dashboard tests pipeline"
+ discard:
+ build:
+ keep_num: 50
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-dashboard-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/dashboard:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ override-votes:
+ gerritBuildUnstableVerifiedValue: 1
+ gerritBuildUnstableCodeReviewValue: 1
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
new file mode 100644
index 0000000..f6a3162
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
@@ -0,0 +1,43 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_metallb_merge_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-metallb-merge-pipeline
+ display_name: "MetalLB merge pipeline"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-metallb-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**mcp**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ change:
+ - merged
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+ KUBE_PROD_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_prod_docker_registry}
+ description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
new file mode 100644
index 0000000..8ebd8eb
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
@@ -0,0 +1,48 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_metallb_test_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-metallb-test-pipeline
+ display_name: "MetalLB tests pipeline"
+ discard:
+ build:
+ keep_num: 50
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-metallb-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/metallb:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ override-votes:
+ gerritBuildUnstableVerifiedValue: 1
+ gerritBuildUnstableCodeReviewValue: 1
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index f076a78..331bd7e 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -71,7 +71,11 @@
mcp/{{oscore-qa-project}}:
branches:
- master
+ - queens
- pike
+ - ocata
+ - newton
+ - mitaka
event:
patchset:
- created
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index 0ef4b5b..0a2c6ed 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -19,13 +19,16 @@
credentials: "gerrit"
branch: 'master'
script: test-cookiecutter-model-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H H(0-3) * * *"
param:
CREDENTIALS_ID:
type: string
description: "ID of jenkins credentials for connecting to gerrit"
default: "gerrit"
COOKIECUTTER_TEMPLATE_CONTEXT_FILE:
- type: choice
+ type: string
description: "Context for cookiecutter template specified as filename"
default: 'stacklight-openstack-ovs-core-pike'
OPENSTACK_API_PROJECT:
@@ -57,5 +60,5 @@
default: 'core,openstack,ovs,stacklight'
STACK_DELETE:
type: boolean
- description: "Delete Heat stack when finished (bool)"
- default: 'false'
+ description: "Delete Heat stack when finished (bool). Don't enable it if you need to use the lab after"
+ default: 'true'
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 6187e93..c0ebf40 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -133,6 +133,10 @@
type: string
default: ""
description: Rally scenarios directory or file with scenarios
+ RALLY_SL_SCENARIOS:
+ type: string
+ default: ""
+ description: Stacklight Rally scenarios directory or file with scenarios
RALLY_TASK_ARGS_FILE:
type: string
default: ""
@@ -161,6 +165,10 @@
type: boolean
default: 'false'
description: If chosen then K8S Rally test will be executed
+ STACKLIGHT_RALLY:
+ type: boolean
+ default: 'false'
+ description: If chosen then Stacklight Rally test will be executed
JOB_TIMEOUT:
type: string
default: "3"
diff --git a/keepalived/cluster/instance/openstack_barbican_vip.yml b/keepalived/cluster/instance/openstack_barbican_vip.yml
new file mode 100644
index 0000000..3c733c4
--- /dev/null
+++ b/keepalived/cluster/instance/openstack_barbican_vip.yml
@@ -0,0 +1,11 @@
+classes:
+- service.keepalived.cluster.single
+parameters:
+ _param:
+ keepalived_openstack_barbican_vip_address: ${_param:cluster_vip_address}
+ keepalived_openstack_barbican_vip_password: password
+ keepalived_openstack_barbican_vip_interface: eth1
+ keepalived_vip_virtual_router_id: 250
+ keepalived_vip_address: ${_param:keepalived_openstack_barbican_vip_address}
+ keepalived_vip_password: ${_param:keepalived_openstack_barbican_vip_password}
+ keepalived_vip_interface: ${_param:keepalived_openstack_barbican_vip_interface}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index c9642bd..24840fe 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -5,10 +5,13 @@
- system.haproxy.proxy.listen.openstack.keystone.standalone
- system.linux.system.users.keystone
- system.keystone.server.fernet_rotation.cluster
+- system.salt.minion.cert.mysql.clients.openstack.keystone
parameters:
_param:
keystone_tokens_expiration: 3600
openstack_node_role: primary
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -42,6 +45,13 @@
name: keystone
password: ${_param:mysql_keystone_password}
user: keystone
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_keystone_ssl_ca_file}
+ key_file: ${_param:mysql_keystone_client_ssl_key_file}
+ cert_file: ${_param:mysql_keystone_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
tokens:
engine: fernet
expiration: ${_param:keystone_tokens_expiration}
diff --git a/keystone/server/fernet_rotation/cluster.yml b/keystone/server/fernet_rotation/cluster.yml
index a4aad33..7da8b5b 100644
--- a/keystone/server/fernet_rotation/cluster.yml
+++ b/keystone/server/fernet_rotation/cluster.yml
@@ -24,6 +24,10 @@
credential_rotation_driver: ${_param:credential_rotation_driver}
linux:
system:
+ cron:
+ user:
+ keystone:
+ enabled: true
job:
keystone_fernet_rotate_rsync:
command: '/var/lib/keystone/keystone_keys_rotate.sh -r -s -t fernet >> /var/log/keystone/keystone-rotate.log 2>> /var/log/keystone/keystone-rotate.log'
diff --git a/keystone/server/fernet_rotation/single.yml b/keystone/server/fernet_rotation/single.yml
index de5ca6a..bb6f234 100644
--- a/keystone/server/fernet_rotation/single.yml
+++ b/keystone/server/fernet_rotation/single.yml
@@ -10,6 +10,10 @@
credential_rotation_driver: ${_param:credential_rotation_driver}
linux:
system:
+ cron:
+ user:
+ keystone:
+ enabled: true
job:
keystone_fernet_rotate_rsync:
command: '/var/lib/keystone/keystone_keys_rotate.sh -r -t fernet >> /var/log/keystone/keystone-rotate.log 2>> /var/log/keystone/keystone-rotate.log'
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index e1131c0..d926c0d 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -2,6 +2,7 @@
- service.keystone.server.single
- system.linux.system.users.keystone
- system.keystone.server.fernet_rotation.single
+- system.salt.minion.cert.mysql.clients.openstack.keystone
parameters:
_param:
keystone_service_token: token
@@ -11,6 +12,8 @@
mysql_keystone_password: password
keystone_tokens_expiration: 3600
openstack_node_role: primary
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -41,6 +44,13 @@
name: keystone
password: ${_param:mysql_keystone_password}
user: keystone
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_keystone_ssl_ca_file}
+ key_file: ${_param:mysql_keystone_client_ssl_key_file}
+ cert_file: ${_param:mysql_keystone_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
tokens:
engine: fernet
expiration: ${_param:keystone_tokens_expiration}
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index c178ced..9151987 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -19,6 +19,7 @@
kubernetes_sriov_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
kubernetes_cniplugins_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
kubernetes_dashboard_repo: k8s.gcr.io
+ kubernetes_coredns_repo: coredns
# component docker images
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -26,8 +27,8 @@
kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.1.3
kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v3.1.3
kubernetes_calico_kube_controllers_image: ${_param:kubernetes_calico_kube_ctl_repo}/kube-controllers:v3.1.3
- kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4
- kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4
+ kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.11.2-1
+ kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.11.2-1
kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.1.2
@@ -43,8 +44,8 @@
kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-138-gbf5dbaa
kubernetes_genie_source_hash: md5=b024052ed4ecb1d5354e0cc8f51afaca
kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
- kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.6.2
- kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.6.2
+ kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3
+ kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3
kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-8-g8b7ed98
kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
@@ -53,12 +54,13 @@
kubernetes_fluentd_aggregator_image: fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
kubernetes_fluentd_logger_image: fluent/fluentd-kubernetes-daemonset:v1.2-debian-stackdriver
kubernetes_telegraf_image: docker.io/telegraf:1.5.3
+ kubernetes_coredns_image: ${_param:kubernetes_coredns_repo}/coredns:1.2.0
kubelet_fail_on_swap: true
kubernetes_dashboard_enabled: true
- kubernetes_kubedns_enabled: true
+ kubernetes_kubedns_enabled: false
kubernetes_externaldns_enabled: false
- kubernetes_coredns_enabled: false
+ kubernetes_coredns_enabled: true
kubernetes_externaldns_provider: coredns
kubernetes_virtlet_enabled: false
kubernetes_flannel_enabled: false
@@ -163,6 +165,7 @@
provider: ${_param:kubernetes_externaldns_provider}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
+ image: ${_param:kubernetes_coredns_image}
contrail_network_controller:
enabled: ${_param:kubernetes_contrail_network_controller_enabled}
image: ${_param:kubernetes_contrail_network_controller_image}
diff --git a/kubernetes/control/opencontrail.yaml b/kubernetes/control/opencontrail.yml
similarity index 70%
rename from kubernetes/control/opencontrail.yaml
rename to kubernetes/control/opencontrail.yml
index ba22753..e5556fa 100644
--- a/kubernetes/control/opencontrail.yaml
+++ b/kubernetes/control/opencontrail.yml
@@ -3,6 +3,9 @@
opencontrail_identity_user: admin
opencontrail_identity_password: contrail123
opencontrail_identity_tenant: admin
+ opencontrail_public_ip_range: 172.17.47.128/25
+ opencontrail_public_ip_network: default-domain:default-project:Public
+ opencontrail_private_ip_range: 10.150.0.0/16
kubernetes:
pool:
network:
@@ -13,17 +16,17 @@
network:
engine: none
opencontrail:
- version: {{ cookiecutter.opencontrail_version }}
- public_ip_range: {{ cookiecutter.opencontrail_public_ip_range }}
- public_network: {{ cookiecutter.get('opencontrail_public_ip_network', 'default-domain:default-project:Public') }}
- private_ip_range: {{ cookiecutter.opencontrail_private_ip_range }}
+ version: ${_param:opencontrail_version}
+ public_ip_range: ${_param:opencontrail_public_ip_range}
+ public_network: ${_param:opencontrail_public_ip_network}
+ private_ip_range: ${_param:opencontrail_private_ip_range}
config:
api:
host: ${_param:opencontrail_control_address}
identity:
auth_user: ${_param:opencontrail_identity_user}
auth_password: ${_param:opencontrail_identity_password}
- auth_tenant: ${_param:kubernetes_opencontrail_identity_tenant}
+ auth_tenant: ${_param:opencontrail_identity_tenant}
message_queue:
host: ${_param:single_address}
database:
diff --git a/linux/system/single/simple.yml b/linux/system/single/simple.yml
index 2b4e919..45be219 100644
--- a/linux/system/single/simple.yml
+++ b/linux/system/single/simple.yml
@@ -8,6 +8,16 @@
local_package_repos: false
linux:
system:
+ at:
+ enabled: true
+ user:
+ root:
+ enabled: true
+ cron:
+ enabled: true
+ user:
+ root:
+ enabled: true
local_package_repos: ${_param:local_package_repos}
timezone: UTC
locale:
diff --git a/linux/system/users/keystone.yml b/linux/system/users/keystone.yml
index 14e38dd..cda4c36 100644
--- a/linux/system/users/keystone.yml
+++ b/linux/system/users/keystone.yml
@@ -8,7 +8,7 @@
home: /var/lib/keystone
uid: 301
gid: 301
- shell: /bin/false
+ shell: /bin/bash
system: True
group:
keystone:
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 703f196..12baf43 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -4,9 +4,12 @@
- service.neutron.control.cluster
- system.haproxy.proxy.listen.openstack.neutron
- system.galera.server.database.neutron
+- system.salt.minion.cert.mysql.clients.openstack.neutron
parameters:
_param:
cluster_internal_protocol: 'http'
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -37,6 +40,14 @@
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
neutron:
server:
+ database:
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_neutron_ssl_ca_file}
+ key_file: ${_param:mysql_neutron_client_ssl_key_file}
+ cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
role: ${_param:openstack_node_role}
plugin: contrail
identity:
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 3f80a55..5800060 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -17,6 +17,7 @@
cluster_internal_protocol: 'http'
neutron:
server:
+ role: ${_param:openstack_node_role}
global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
l3_ha: ${_param:neutron_l3_ha}
dvr: ${_param:neutron_control_dvr}
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 6196c0a..6ced2f1 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,9 +1,12 @@
classes:
- service.neutron.control.single
- system.galera.server.database.neutron
+- system.salt.minion.cert.mysql.clients.openstack.neutron
parameters:
_param:
internal_protocol: 'http'
+ openstack_mysql_x509_enabled: False
+ galera_ssl_enabled: False
linux:
system:
package:
@@ -15,5 +18,12 @@
role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
+ x509:
+ enabled: ${_param:openstack_mysql_x509_enabled}
+ ca_file: ${_param:mysql_neutron_ssl_ca_file}
+ key_file: ${_param:mysql_neutron_client_ssl_key_file}
+ cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
identity:
protocol: ${_param:internal_protocol}
diff --git a/openssh/server/team/drivetrain.yml b/openssh/server/team/drivetrain.yml
new file mode 100644
index 0000000..a48400a
--- /dev/null
+++ b/openssh/server/team/drivetrain.yml
@@ -0,0 +1,10 @@
+classes:
+- system.openssh.server.team.members.degorenko
+- system.openssh.server.team.members.iberezovskiy
+
+parameters:
+ _param:
+ linux_system_user_sudo: true
+ openssh:
+ server:
+ enabled: true
diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index 33cc697..6f79522 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -4,8 +4,8 @@
- system.openssh.server.team.members.omolchanov
- system.openssh.server.team.members.ibumarskov
- system.openssh.server.team.members.vkhlyunev
-- system.openssh.server.team.members.vjigulin
- system.openssh.server.team.members.dtsapikov
+- system.openssh.server.team.members.rlubianyi
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 38e19c3..e97e755 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -1,3 +1,9 @@
+classes:
+- system.linux.system.sudo
+- system.openssh.server.team.members.mshalamov
+- system.openssh.server.team.members.sandriichenko
+- system.openssh.server.team.members.aminasyan
+- system.openssh.server.team.members.imenkov
parameters:
_param:
linux_system_user_sudo: true
@@ -70,12 +76,6 @@
sudo: true
full_name: Sergey Sokolov
home: /home/ssokolov
- mshalamov:
- enabled: true
- name: mshalamov
- sudo: true
- full_name: Maksym Shalamov
- home: /home/mshalamov
schipiga:
enabled: true
name: schipiga
@@ -149,20 +149,6 @@
full_name: Sergey Novikov
home: /home/snovikov
email: snovikov@mirantis.com
- aminasyan:
- enabled: true
- name: aminasyan
- sudo: true
- full_name: Artem Minasyan
- home: /home/aminasyan
- email: aminasyan@mirantis.com
- imenkov:
- enabled: true
- name: imenkov
- sudo: true
- full_name: Ilya Menkov
- home: /home/imenkov
- email: imenkov@mirantis.com
group:
libvirtd:
enabled: true
@@ -226,11 +212,6 @@
public_keys:
- ${public_keys:ssokolov}
user: ${linux:system:user:ssokolov}
- mshalamov:
- enabled: true
- public_keys:
- - ${public_keys:mshalamov}
- user: ${linux:system:user:mshalamov}
schipiga:
enabled: true
public_keys:
@@ -286,16 +267,6 @@
public_keys:
- ${public_keys:snovikov}
user: ${linux:system:user:snovikov}
- aminasyan:
- enable: true
- public_keys:
- - ${public_keys:aminasyan}
- user: ${linux:system:user:aminasyan}
- imenkov:
- enable: true
- public_keys:
- - ${public_keys:imenkov}
- user: ${linux:system:user:imenkov}
public_keys:
ddmitriev:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuD4wJ8hzkchQ0pfgdwWukQyps1xYRfHOsjosmDu/mmgaXVud5mnpwb2q35E2YYTox2mx+ulJqyS+099gz6MPg4P8D5qdMuRbAsJqbceLaaIGQhdT8qgSo7ESrl5pwvYnfWzKLKF0z5s7nrW0nvArC40zhV9o9XpvzzzSFByepWfkwA8ReldGUYVvTKp8YXaCrqEdMZrU42adPM2nl+fYBbGF+h4/Ka247aVjPeER0blV3znFXbv2Kf38G+i/TEGaktgpBdtGGDi1tX2loMypmTJeqZRJnM0Eoly0BnynB7CSxn11eoIXBUe1mVYNqmQd1hw6uh59iymhK5j939v9J ddmitriev@dis_xcom
@@ -319,8 +290,6 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@Adams-MacBook-Pro.local
ssokolov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHuIo/dLh5qt+8jV4UUPqDo6ktJc12HVFg10S3hinjJUlAOxq8554l0LMvxmiZSrIjxGE/qUr8PlRgjLi4x4zQDggBdNGC/S4zcYNEiTQ7HaOFOjEJ0si6ODZfssQsr/A/bXdNOZE/nIZTUhTddJG+3nKUvuPnTeOQLqEOp4IFJwwvwnD2Wo4I1nc6+yDSJLuG8ANLtLlStzpMKr8wHvPWCUcB9B1oeeOVtw9+vEKxuUBkheXnXMh7shiyt4vmaFVbcgcHGPg8DjP8alKeAbIk0AYhiuNHV/rFzL+/kfImS94gU93A8vt0U2vCj8golqt2huxJblKDr4Abq1lDXLwn ssm@n104309
- mshalamov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzGhXA8t3nWeeM8+L3drG+4ACt9pOS1CVAAsW634Q6EtbxSzpsdp3NEJ3X8jKmfiwGZmqUiJ0G0lzS+vHdQ4vJ58M9f7YpXYYah8/557YLvIgg+F/3cltS7PHSE3jqNZgQBHG0f4SRwiBq4zhWhDOCXtzHmsT4EUj+9K6EOlPk7SjrOQAZA0XcPl//lw8g5zHAAC6phNa+WzHLzQSyWAZZhIKyvbXTHpSAUAww5rIlquucxVMbnbqlSOD4FTikSOLQa9iq4Nx10c3ZZTD3xTMuissSj5XJU5LaO7qlraOBsKTlkO0T+VS1aMnfJ943QSI2wu6epKWWHAFXV7Z2nsTL mshalamov@mirantis.com
schipiga:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDamKTbqCQCGW1JLo+4PgntC1TkRrwbDOELyRVHxAlc56CcJE9QjrNnCOTqvgRoAmIC+P86nzUQxwSREMd0qgVCefAxKQVFVQ38oym9G90TF0nx4fFT3hUhEQwjMBjHhR2Vo+uUwbT2Hg51U1gBPx/WFa0U5Cf7V6+XNJ3r22W4XG8OrbuAoapwl4WN1346HEj3d0U6Z8Unsqjx9pRpZ1eYCeng4emLZ1UOhvLBfw22vSTkujjjRdfY6g52Gv4hRsgsS+JWulO+z/qd1GFcUp9j+yIvur+eeTWHelAbXq4kRNQfQjAs6nMM8Hp8gPa5jLYqMz2GgD96p8wOQCdK2nyL schipiga@mirantis.com
obutenko:
@@ -343,8 +312,3 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEaWwPVtsj39s0A2efRQ1ejL5B7ZetFPmXJDi/8W/gTWIIII3xP750H8QWZfvbjiJ+KBCxOndDL8aL3SHC/iRCvmzrVkgXBgf5J9vTu8uas7BNGf7oiDBuB75fryDtkg57Pam/A47IlgxJTCwYz+ofUGHb6WrWwQ+MUTEWAk9PB+RPyxjwNC4XxEwtULkKQMgFmg52kauESpx0R0ni8/LLKUJucdse7NCcUTvEcafppnXsxdZ640G0K82ADS1neg1CDwdtCPKLG57GZYs4iL3sPcOhQxnVUoONXsRpBD8kQTKOMl5R6hTDJHBd3oimUPEXlPqeb/XeGKatVraRA6nJ ekhomyakova@ekhomyakova
snovikov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYj97WGfiL550eVPyQmFyrgpTw61tfins1CpgrZewWqAWJMgYklRdMYl4OReE5UO2po7ag0f/QsOtGU8aQbnxnWUYPZyS3Qk+Bg8OOSBmewPxmT7WH97KdGKBdC9b3xUNFOUXEUOMmOe3jq9YET+xebUnfsA5qwYU5dL9Cb5UAPzVxYI8z5RiaNTo8dtwZr7lbJJRy8YfSWCtiD59vewc6BE2NTUyDjsfmKd9K/IkyKboGU9AC5mLYDsjvWwiGcNdfigRyaYWKmoo7Xhe1W2Og4dpI5pozOwVg7hISW9NRgLXrZP/9me1rFBH7EQjpjO3+Pto1//R3Nx9QLsB59yuj snovikov@snovikov
- aminasyan:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo9BHw8WdIFOEuY10XvUqHPl1jCqtA8TYntt5Aee2rR8X8pLG9lWjHPFkNArD5upCRvv6f88Xs4QLoEGWMWcbfMkJE4gMNkOWL4As5iNgagw+DybQrA6nXyassHi8le+quwICfJ1v16IXxPgMBCcrRcSYvHKv+n8KsuBH1csRnJ8aHvIZJTL43Eq0F+aj2S0/9D+m2dyRwcmamn6EqX61NfL5UP3422i4JykTXY6I8iwEHs7Er+jPBD7rtJ/q4Kn/bIyT/Vz0tGHiWyVt7B8GBoPb3PgDuzXKvU7OtOxFb3uhANeecjzIz5G5rAsAQcizf+MGCOoBwFLFJTPAharWN artem@Artem
- imenkov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSWoSuHV1FNRuooS3d0nVkTRCwC+Tc585Z1cPcMQns7H1ogLIya//T3gMfxINxCjlF1eek18vI9B5QszZZUL2P7prFxe5EJlt6iM8jD61umkncaTbx6oc8r8xu5ufH9RDxfKHvQX1mhhID5JK+/GoRDIW5Zs7wFSHCrANYV2dtmOfmRSc/qpgh87Z9X10UDymp5MLjpQZzjM+qZCtz6yV14m835j4eiEN7+QZ2XZ/Wtzer7VVdhtjbw8gESSyuPIVf66keuLVUixk0CXosQYrqWDPWpT0Rhh63lnUacgplh74TU+bb+vYRjIHxCgOY2Ex6Pk5jrsroi0YoWtI4SErD imenkov@atopilin-nb-wifi.srt.mirantis.net
-
diff --git a/openssh/server/team/members/aminasyan.yml b/openssh/server/team/members/aminasyan.yml
new file mode 100644
index 0000000..9664442
--- /dev/null
+++ b/openssh/server/team/members/aminasyan.yml
@@ -0,0 +1,21 @@
+parameters:
+ linux:
+ system:
+ user:
+ aminasyan:
+ enabled: true
+ name: aminasyan
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Artem Minasyan
+ home: /home/aminasyan
+ email: aminasyan@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ aminasyan:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo9BHw8WdIFOEuY10XvUqHPl1jCqtA8TYntt5Aee2rR8X8pLG9lWjHPFkNArD5upCRvv6f88Xs4QLoEGWMWcbfMkJE4gMNkOWL4As5iNgagw+DybQrA6nXyassHi8le+quwICfJ1v16IXxPgMBCcrRcSYvHKv+n8KsuBH1csRnJ8aHvIZJTL43Eq0F+aj2S0/9D+m2dyRwcmamn6EqX61NfL5UP3422i4JykTXY6I8iwEHs7Er+jPBD7rtJ/q4Kn/bIyT/Vz0tGHiWyVt7B8GBoPb3PgDuzXKvU7OtOxFb3uhANeecjzIz5G5rAsAQcizf+MGCOoBwFLFJTPAharWN artem@Artem
+ user: ${linux:system:user:aminasyan}
+
\ No newline at end of file
diff --git a/openssh/server/team/members/asamoylov.yml b/openssh/server/team/members/asamoylov.yml
new file mode 100644
index 0000000..63bfdd3
--- /dev/null
+++ b/openssh/server/team/members/asamoylov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ asamoylov:
+ enabled: true
+ name: asamoylov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Anton Samoylov
+ home: /home/asamoylov
+ email: asamoylov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ asamoylov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwNiivTQ04f2ckhd6Zku7SFav6vAnVhGas3E9JbqIa222YhZdIqeCp7Su1jDmyuMsCe+ibRWNh9z+TnGb40qr2mbR+XyAeXv2kkUy1hc61Si1SWc2n0mrx7xh8aiGqMifra+WojBVVMHnknmdVFqGtq2hJSWrNYikdxKKI241EQ9Grta/iIjzlXmSSetcf54amsMJS8qMWOU7nW65EhSXNH3gUBdUV/85PJaTAChAKeOI3K7/jjogJ9hwYcpTVZCcCxEST6R6Q8Xhm5FXx1Fa6+nuGQYF8j9DF+tqWtoIuwlpNF5jn7ddr4qhVQkNpVEnMORT+2qhtOsvRPySqHbGb
+ user: ${linux:system:user:asamoylov}
diff --git a/openssh/server/team/members/degorenko.yml b/openssh/server/team/members/degorenko.yml
new file mode 100644
index 0000000..2f0d09e
--- /dev/null
+++ b/openssh/server/team/members/degorenko.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ degorenko:
+ enabled: true
+ name: degorenko
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Denis Egorenko
+ home: /home/degorenko
+ email: degorenko@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ degorenko:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBUclrfSgL1AGw8gjjAcfD2XP9beQVRcP+FMTsuro/2UXjNN7fQ9oXm0TbIk5u+hgILrgjOkbxb1K7bYzdS7+zF3cFoK5B8GKaQog/frEZ2Y4NdkyK3nm5RX1NfxguND3pzEhr5tar/gi+C59uNWA70FF6lqi2yzqA6cWsBM4lP8ZVCOoKJpJNbXe8HXNDmHbVLP+kXzG7k0j/ifAHaF4Rsp+r9B7NupA28N0VhOaXooDRt8TrbqVPZRKuk2XIvitiw73b7ZoiErfOarkkAR6vI2pMrJLFiXm1J2kZHf1CLCl2EdVuS2ba7LtQo77Qw++YeYM4zdGQ5Xr+yjztgxXX degorenko
+ user: ${linux:system:user:degorenko}
diff --git a/openssh/server/team/members/iberezovskiy.yml b/openssh/server/team/members/iberezovskiy.yml
new file mode 100644
index 0000000..14e868f
--- /dev/null
+++ b/openssh/server/team/members/iberezovskiy.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ iberezovskiy:
+ enabled: true
+ name: iberezovskiy
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Ivan Berezovskiy
+ home: /home/iberezovskiy
+ email: iberezovskiy@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ iberezovskiy:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnn18VJ7z3CIBaQmIRfYltyh/BogwBq4B9KVUZ0Gl1EWd5AutuR00xCOYdFeU7okaURYILC+8W2A7a9qkML9G99sX+KD+7CDsKm33XeCP4YJ9QhOwA+OYPS84lLExvK+9AoVPnB06sEK8CvPdU6byQE/EX1VA9gFFCraOH1D0eABaC01csHI+GaiIA5qSjDMH+ieii1Rv5Zb6NHyYRktaCSHB2asu5Y7VxmL2srweFJonpk4Z80+TWlc2ESRLc9EFMefRt/MixIyFjBgvcsE++eCO6MModCAoP5V1Tmgd+cztcvm/tlQqJirve/64SFLvDbjYLE9QxQ8bY4/d4MjcX iberezovskiy@tests-MacBook-Pro.local
+ user: ${linux:system:user:iberezovskiy}
diff --git a/openssh/server/team/members/imenkov.yml b/openssh/server/team/members/imenkov.yml
new file mode 100644
index 0000000..b2ae055
--- /dev/null
+++ b/openssh/server/team/members/imenkov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ imenkov:
+ enabled: true
+ name: imenkov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Ilya Menkov
+ home: /home/imenkov
+ email: imenkov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ imenkov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSWoSuHV1FNRuooS3d0nVkTRCwC+Tc585Z1cPcMQns7H1ogLIya//T3gMfxINxCjlF1eek18vI9B5QszZZUL2P7prFxe5EJlt6iM8jD61umkncaTbx6oc8r8xu5ufH9RDxfKHvQX1mhhID5JK+/GoRDIW5Zs7wFSHCrANYV2dtmOfmRSc/qpgh87Z9X10UDymp5MLjpQZzjM+qZCtz6yV14m835j4eiEN7+QZ2XZ/Wtzer7VVdhtjbw8gESSyuPIVf66keuLVUixk0CXosQYrqWDPWpT0Rhh63lnUacgplh74TU+bb+vYRjIHxCgOY2Ex6Pk5jrsroi0YoWtI4SErD imenkov@atopilin-nb-wifi.srt.mirantis.net
+ user: ${linux:system:user:imenkov}
diff --git a/openssh/server/team/members/mshalamov.yml b/openssh/server/team/members/mshalamov.yml
new file mode 100644
index 0000000..dff804d
--- /dev/null
+++ b/openssh/server/team/members/mshalamov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ mshalamov:
+ enabled: true
+ name: mshalamov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Maksym Shalamov
+ home: /home/mshalamov
+ email: mshalamov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ mshalamov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzGhXA8t3nWeeM8+L3drG+4ACt9pOS1CVAAsW634Q6EtbxSzpsdp3NEJ3X8jKmfiwGZmqUiJ0G0lzS+vHdQ4vJ58M9f7YpXYYah8/557YLvIgg+F/3cltS7PHSE3jqNZgQBHG0f4SRwiBq4zhWhDOCXtzHmsT4EUj+9K6EOlPk7SjrOQAZA0XcPl//lw8g5zHAAC6phNa+WzHLzQSyWAZZhIKyvbXTHpSAUAww5rIlquucxVMbnbqlSOD4FTikSOLQa9iq4Nx10c3ZZTD3xTMuissSj5XJU5LaO7qlraOBsKTlkO0T+VS1aMnfJ943QSI2wu6epKWWHAFXV7Z2nsTL mshalamov@mirantis.com
+ user: ${linux:system:user:mshalamov}
diff --git a/openssh/server/team/members/rlubianyi.yml b/openssh/server/team/members/rlubianyi.yml
new file mode 100644
index 0000000..63f3397
--- /dev/null
+++ b/openssh/server/team/members/rlubianyi.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ rlubianyi:
+ enabled: true
+ name: rlubianyi
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Roman Lubianyi
+ home: /home/rlubianyi
+ email: rlubianyi@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ rlubianyi:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXWwy6p3t4AGvaCtFDJxqKZiPDotJnbu2IKg2p7sl7YXQw+APLKk9maHyUehQQuGzidgBZpmBOMAXENcO1FGFj56cnp4W9tldTiRq1bWcUMq42wfNwIToP6dAXj5ZyhL+UZj1GsCThSasDhFe4Xife0cn69KHJqtmahApQK6D7tpZr2UNDYNWh/2JIrUOcJXZU+BqNg7zm1KNb6e9lKXL6KLDeaCiQ0bj+L/unqepLdg26eO7AQSZ/rt2qAnbfcquozECtDhT4cbK8q9xJODlJQ3eQGOgTH3m8jGijL+3UdPFUzbo4KwSK4V9FmB711HVBCQM4nlH9zumIUSxutnkd rlubianyi@rlubianyi-pc
+ user: ${linux:system:user:rlubianyi}
diff --git a/openssh/server/team/members/sandriichenko.yml b/openssh/server/team/members/sandriichenko.yml
new file mode 100644
index 0000000..adc8fc9
--- /dev/null
+++ b/openssh/server/team/members/sandriichenko.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ sandriichenko:
+ enabled: true
+ name: sandriichenko
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Sofiia Andriichenko
+ home: /home/sandriichenko
+ email: sandriichenko@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ sandriichenko:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC36ZGwGD7WgfEwCDfSkQjiNI3cfgitrRcY+QzXP1+HNLwGoRFiZwmOp2vuYE2JiwvZfxVGXfmFmlDqypFA+H+gNobizGM2S/w7Hz8S5Qja75YBWty9KqdwcRVo7+/cPi4IHsWDxb1xpsiiFMfW2RRvrA3rE131xhwwnfKdZBj5HTlDO+qLIJD0FbJVYehKhJwIJuVGKQyVgj3hepaO17UTbG6IqtZeDz6nb9Sl+3eX5zS+8xS86cHf868M09zmxwrA3uI/eyYT49kMZN+HUezqvrZSG7v3ociOh9P1TI+4TIJN7JaRUAen7hTV2ufgZtNUrOzqXZTuUTmJQmRapAi9 sandriichenko@sandriichenko-pc
+ user: ${linux:system:user:sandriichenko}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 9921b5b..219c2ee 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -8,6 +8,7 @@
- system.openssh.server.team.members.psvimbersky
- system.openssh.server.team.members.gzimin
- system.openssh.server.team.members.dpyzhov
+- system.openssh.server.team.members.asamoylov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index d641f36..3a4cb65 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -11,6 +11,12 @@
panko_memcached_node03_address: ${_param:cluster_node03_address}
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
+ linux:
+ system:
+ cron:
+ user:
+ panko:
+ enabled: true
panko:
server:
role: ${_param:openstack_node_role}
@@ -32,4 +38,4 @@
expirer:
cron:
minute: 0
- hour: 2
\ No newline at end of file
+ hour: 2
diff --git a/panko/server/single.yml b/panko/server/single.yml
index 497b21e..4ba2787 100644
--- a/panko/server/single.yml
+++ b/panko/server/single.yml
@@ -5,6 +5,12 @@
_param:
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
+ linux:
+ system:
+ cron:
+ user:
+ panko:
+ enabled: true
panko:
server:
role: ${_param:openstack_node_role}
@@ -13,4 +19,4 @@
expirer:
cron:
minute: 0
- hour: 2
\ No newline at end of file
+ hour: 2
diff --git a/powerdns/server/cluster.yml b/powerdns/server/cluster.yml
new file mode 100644
index 0000000..b4a5625
--- /dev/null
+++ b/powerdns/server/cluster.yml
@@ -0,0 +1,43 @@
+classes:
+ - service.powerdns.server.single
+parameters:
+ _param:
+ powerdns_axfr_ips_address01: ${_param:openstack_control_node01_address}
+ powerdns_axfr_ips_address02: ${_param:openstack_control_node02_address}
+ powerdns_axfr_ips_address03: ${_param:openstack_control_node03_address}
+ powerdns_supermaster_node01_address: ${_param:openstack_control_node01_address}
+ powerdns_supermaster_node02_address: ${_param:openstack_control_node02_address}
+ powerdns_supermaster_node03_address: ${_param:openstack_control_node03_address}
+ powerdns_supermaster_node01_name: ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+ powerdns_supermaster_node02_name: ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+ powerdns_supermaster_node03_name: ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+ powerdns_webserver_port: 8081
+ powerdns:
+ server:
+ enabled: true
+ api:
+ enabled: true
+ key: ${_param:designate_pdns_api_key}
+ axfr_ips:
+ - ${_param:powerdns_axfr_ips_address01}
+ - ${_param:powerdns_axfr_ips_address02}
+ - ${_param:powerdns_axfr_ips_address03}
+ - 127.0.0.1
+ bind:
+ address: ${_param:single_address}
+ overwrite_supermasters: true
+ supermasters:
+ - ip: ${_param:powerdns_supermaster_node01_address}
+ nameserver: ${_param:powerdns_supermaster_node01_name}
+ account: master
+ - ip: ${_param:powerdns_supermaster_node02_address}
+ nameserver: ${_param:powerdns_supermaster_node02_name}
+ account: master
+ - ip: ${_param:powerdns_supermaster_node03_address}
+ nameserver: ${_param:powerdns_supermaster_node03_name}
+ account: master
+ webserver:
+ enabled: true
+ address: ${_param:single_address}
+ password: ${_param:powerdns_webserver_password}
+ port: ${_param:powerdns_webserver_port}
\ No newline at end of file
diff --git a/reclass/storage/system/openstack_barbican_cluster.yml b/reclass/storage/system/openstack_barbican_cluster.yml
new file mode 100644
index 0000000..1b47ee6
--- /dev/null
+++ b/reclass/storage/system/openstack_barbican_cluster.yml
@@ -0,0 +1,42 @@
+parameters:
+ _param:
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_barbican_system_codename: xenial
+ reclass:
+ storage:
+ node:
+ openstack_barbican_node01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.barbican
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:openstack_barbican_system_codename}
+ single_address: ${_param:openstack_barbican_node01_address}
+ keepalived_vip_priority: 103
+ openstack_node_role: primary
+ openstack_barbican_node02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.barbican
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:openstack_barbican_system_codename}
+ single_address: ${_param:openstack_barbican_node02_address}
+ keepalived_vip_priority: 102
+ openstack_node_role: secondary
+ openstack_barbican_node03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.barbican
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:openstack_barbican_system_codename}
+ single_address: ${_param:openstack_barbican_node03_address}
+ keepalived_vip_priority: 101
+ openstack_node_role: secondary
diff --git a/salt/control/cluster/openstack_barbican_cluster.yml b/salt/control/cluster/openstack_barbican_cluster.yml
new file mode 100644
index 0000000..cfa7ba6
--- /dev/null
+++ b/salt/control/cluster/openstack_barbican_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.barbican:
+ cpu: 4
+ ram: 8192
+ disk_profile: large
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.barbican
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
new file mode 100644
index 0000000..feb1d4f
--- /dev/null
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.manila:
+ cpu: 1
+ ram: 2048
+ disk_profile: large
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.manila
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.manila
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.manila
diff --git a/salt/minion/cert/barbican.yml b/salt/minion/cert/barbican.yml
new file mode 100644
index 0000000..f499732
--- /dev/null
+++ b/salt/minion/cert/barbican.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ salt_minion_ca_host: kmn01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ barbican_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn}
+ salt:
+ minion:
+ cert:
+ barbican_server:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: barbican_server
+ signing_policy: cert_server
+ alternative_names: ${_param:barbican_cert_alternative_names}
+ key_file: ${barbican:server:ssl:key_file}
+ cert_file: ${barbican:server:ssl:cert_file}
+ all_file: ${barbican:server:ssl:all_file}
+ ca_file: ${barbican:server:ssl:ca_file}
+ enabled: true
+ engine: salt
diff --git a/salt/minion/cert/mysql/clients/openstack/aodh.yml b/salt/minion/cert/mysql/clients/openstack/aodh.yml
new file mode 100644
index 0000000..ba5ef52
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/aodh.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_aodh_client_ssl_key_file: /etc/aodh/ssl/mysql/client-key.pem
+ mysql_aodh_client_ssl_cert_file: /etc/aodh/ssl/mysql/client-cert.pem
+ mysql_aodh_ssl_ca_file: /etc/aodh/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-aodh-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-aodh-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_aodh_client_ssl_key_file}
+ cert_file: ${_param:mysql_aodh_client_ssl_cert_file}
+ ca_file: ${_param:mysql_aodh_ssl_ca_file}
+ user: aodh
+ group: aodh
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/cinder.yml b/salt/minion/cert/mysql/clients/openstack/cinder.yml
index ec6a77a..1ff053f 100644
--- a/salt/minion/cert/mysql/clients/openstack/cinder.yml
+++ b/salt/minion/cert/mysql/clients/openstack/cinder.yml
@@ -2,9 +2,9 @@
_param:
salt_minion_ca_host: cfg01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
- mysql_cinder_client_ssl_key_file: /etc/pki/mysql-cinder-client/client-key.pem
- mysql_cinder_client_ssl_cert_file: /etc/pki/mysql-cinder-client/client-cert.pem
- mysql_cinder_ssl_ca_file: /etc/pki/mysql-cinder-client/ca-cert.pem
+ mysql_cinder_client_ssl_key_file: /etc/cinder/ssl/mysql/client-key.pem
+ mysql_cinder_client_ssl_cert_file: /etc/cinder/ssl/mysql/client-cert.pem
+ mysql_cinder_ssl_ca_file: /etc/cinder/ssl/mysql/ca-cert.pem
salt:
minion:
cert:
@@ -24,4 +24,4 @@
ca_file: ${_param:mysql_cinder_ssl_ca_file}
user: cinder
group: cinder
- mode: 640
\ No newline at end of file
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/designate.yml b/salt/minion/cert/mysql/clients/openstack/designate.yml
new file mode 100644
index 0000000..f66c59f
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/designate.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_designate_client_ssl_key_file: /etc/designate/ssl/mysql/client-key.pem
+ mysql_designate_client_ssl_cert_file: /etc/designate/ssl/mysql/client-cert.pem
+ mysql_designate_ssl_ca_file: /etc/designate/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-designate-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-designate-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_designate_client_ssl_key_file}
+ cert_file: ${_param:mysql_designate_client_ssl_cert_file}
+ ca_file: ${_param:mysql_designate_ssl_ca_file}
+ user: designate
+ group: designate
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/glance.yml b/salt/minion/cert/mysql/clients/openstack/glance.yml
new file mode 100644
index 0000000..ab71174
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/glance.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_glance_client_ssl_key_file: /etc/glance/ssl/mysql/client-key.pem
+ mysql_glance_client_ssl_cert_file: /etc/glance/ssl/mysql/client-cert.pem
+ mysql_glance_ssl_ca_file: /etc/glance/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-glance-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-glance-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_glance_client_ssl_key_file}
+ cert_file: ${_param:mysql_glance_client_ssl_cert_file}
+ ca_file: ${_param:mysql_glance_ssl_ca_file}
+ user: glance
+ group: glance
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/heat.yml b/salt/minion/cert/mysql/clients/openstack/heat.yml
new file mode 100644
index 0000000..1246dae
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/heat.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_heat_client_ssl_key_file: /etc/heat/ssl/mysql/client-key.pem
+ mysql_heat_client_ssl_cert_file: /etc/heat/ssl/mysql/client-cert.pem
+ mysql_heat_ssl_ca_file: /etc/heat/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-heat-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-heat-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_heat_client_ssl_key_file}
+ cert_file: ${_param:mysql_heat_client_ssl_cert_file}
+ ca_file: ${_param:mysql_heat_ssl_ca_file}
+ user: heat
+ group: heat
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/keystone.yml b/salt/minion/cert/mysql/clients/openstack/keystone.yml
new file mode 100644
index 0000000..c0fe71d
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/keystone.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_keystone_client_ssl_key_file: /etc/keystone/ssl/mysql/client-key.pem
+ mysql_keystone_client_ssl_cert_file: /etc/keystone/ssl/mysql/client-cert.pem
+ mysql_keystone_ssl_ca_file: /etc/keystone/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-keystone-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-keystone-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_keystone_client_ssl_key_file}
+ cert_file: ${_param:mysql_keystone_client_ssl_cert_file}
+ ca_file: ${_param:mysql_keystone_ssl_ca_file}
+ user: keystone
+ group: keystone
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/neutron.yml b/salt/minion/cert/mysql/clients/openstack/neutron.yml
new file mode 100644
index 0000000..d5b1cd8
--- /dev/null
+++ b/salt/minion/cert/mysql/clients/openstack/neutron.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ mysql_neutron_client_ssl_key_file: /etc/neutron/ssl/mysql/client-key.pem
+ mysql_neutron_client_ssl_cert_file: /etc/neutron/ssl/mysql/client-cert.pem
+ mysql_neutron_ssl_ca_file: /etc/neutron/ssl/mysql/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ mysql-neutron-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: mysql-neutron-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:mysql_neutron_client_ssl_key_file}
+ cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
+ ca_file: ${_param:mysql_neutron_ssl_ca_file}
+ user: neutron
+ group: neutron
+ mode: 640
diff --git a/salt/minion/cert/mysql/clients/openstack/nova.yml b/salt/minion/cert/mysql/clients/openstack/nova.yml
index 154a553..955d6eb 100644
--- a/salt/minion/cert/mysql/clients/openstack/nova.yml
+++ b/salt/minion/cert/mysql/clients/openstack/nova.yml
@@ -2,9 +2,9 @@
_param:
salt_minion_ca_host: cfg01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
- mysql_nova_client_ssl_key_file: /etc/pki/mysql-nova-client/client-key.pem
- mysql_nova_client_ssl_cert_file: /etc/pki/mysql-nova-client/client-cert.pem
- mysql_nova_ssl_ca_file: /etc/pki/mysql-nova-client/ca-cert.pem
+ mysql_nova_client_ssl_key_file: /etc/nova/ssl/mysql/client-key.pem
+ mysql_nova_client_ssl_cert_file: /etc/nova/ssl/mysql/client-cert.pem
+ mysql_nova_ssl_ca_file: /etc/nova/ssl/mysql/ca-cert.pem
salt:
minion:
cert:
@@ -24,4 +24,4 @@
ca_file: ${_param:mysql_nova_ssl_ca_file}
user: nova
group: nova
- mode: 640
\ No newline at end of file
+ mode: 640
diff --git a/xtrabackup/server/single.yml b/xtrabackup/server/single.yml
index f72a92a..ad06a94 100644
--- a/xtrabackup/server/single.yml
+++ b/xtrabackup/server/single.yml
@@ -4,3 +4,9 @@
_param:
xtrabackup_qpress_source: pkg
xtrabackup_qpress_source_name: qpress
+ linux:
+ system:
+ cron:
+ user:
+ xtrabackup:
+ enabled: true
diff --git a/zookeeper/backup/server/single.yml b/zookeeper/backup/server/single.yml
index 6796d8a..a97df06 100644
--- a/zookeeper/backup/server/single.yml
+++ b/zookeeper/backup/server/single.yml
@@ -3,6 +3,12 @@
parameters:
_param:
zookeeper_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN
+ linux:
+ system:
+ cron:
+ user:
+ zookeeper:
+ enabled: true
zookeeper:
backup:
server: