Merge "Sync sl-k8s-calico model with virtual-mcp11-k8s-calico"
diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index a360806..5691518 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.repo.mcp.salt
+ - system.linux.system.repo.mcp.extra
- system.salt.master.pkg
- system.salt.master.api
- system.salt.minion.ca.salt_master
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index d26942b..dc719bd 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.single
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server_single
- system.salt.minion.cert.k8s_server_single
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index 5923e3d..08791f1 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
index 5564e9c..3a8012f 100644
--- a/classes/cluster/k8s-compact/kubernetes/control.yml
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -2,6 +2,8 @@
- system.salt.minion.cert.etcd_server_single
- system.salt.minion.cert.k8s_server_single
- service.etcd.server.single
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.kubernetes.master.single
- cluster.k8s-compact.kubernetes.compute
parameters:
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 0d755a2..5144fe6 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
index cc7a920..485b274 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 26a8608..f685589 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 8ef2041..78cd765 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/model-manager/model_manager/dashboard.yml b/classes/cluster/model-manager/model_manager/dashboard.yml
index 6377ecd..db28c96 100644
--- a/classes/cluster/model-manager/model_manager/dashboard.yml
+++ b/classes/cluster/model-manager/model_manager/dashboard.yml
@@ -13,7 +13,7 @@
protocol: http
endpoint: internalURL
source:
- commit_id: 'd39884f86cb5517c2d058a6772abbb21f87baf73'
+ commit_id: '50cbdce293181e7c789815434f47397ffa526ec9'
linux:
network:
interface:
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
index 5eb1d43..f972948 100644
--- a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
@@ -15,7 +15,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 61f2b6b..7b91adf 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -38,7 +38,7 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
docker_influxdb_image: influxdb:1.2
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index a9ae634..f8c0efa 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -38,7 +38,7 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index e85cff6..e4d89a1 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -41,6 +41,7 @@
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
single_address: 172.16.10.90
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -49,6 +50,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 8eaf978..f8469d2 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -53,7 +53,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index 945673b..0f10552 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -49,6 +49,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
+ reclass_config_master_gateway: ${_param:infra_config_gateway_address}
single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -58,6 +59,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index 3722558..eeed3a6 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -6,6 +6,7 @@
cluster_name: sl-os-ovs
infra_config_hostname: cfg01
infra_config_deploy_address: 192.168.10.90
+ infra_config_gateway_address: 192.168.10.1
infra_config_address: 172.16.10.100
linux:
network:
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 019e4b3..071b036 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -53,7 +53,7 @@
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
grafana_admin_password: admin
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-pike-dvr/.env b/classes/cluster/sl-pike-dvr/.env
new file mode 100644
index 0000000..13e6475
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
diff --git a/classes/cluster/sl-pike-dvr/infra/backup/client_common.yml b/classes/cluster/sl-pike-dvr/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+ _param:
+ backupninja_backup_host: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ # for salt-master backup
+ backupninja:
+ client:
+ target:
+ home_dir: /srv/volumes/backup/backupninja
+ engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/sl-pike-dvr/infra/backup/client_mysql.yml b/classes/cluster/sl-pike-dvr/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..9d0cace
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/infra/backup/client_mysql.yml
@@ -0,0 +1,37 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+ _param:
+ xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ xtrabackup:
+ server:
+ enabled: false
+ backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/sl-pike-dvr/infra/backup/server.yml b/classes/cluster/sl-pike-dvr/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+ _param:
+ backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/sl-pike-dvr/infra/config.yml b/classes/cluster/sl-pike-dvr/infra/config.yml
new file mode 100644
index 0000000..6e5d423
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/infra/config.yml
@@ -0,0 +1,203 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+#- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_dns_cluster
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklightv2_server_cluster
+- cluster.sl-pike-dvr.infra.backup.client_common
+- cluster.sl-pike-dvr.openstack.proxy
+- cluster.sl-pike-dvr.stacklight.proxy
+- cluster.sl-pike-dvr
+parameters:
+ _param:
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
+ single_address: 172.16.10.100
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ linux:
+ network:
+ interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_web:
+ proxy:
+ host: ${_param:openstack_proxy_address}
+ nginx_proxy_openstack_api_heat_cfn:
+ enabled: false
+ salt:
+ master:
+ backup: true
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ minion:
+ backup: true
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ - cluster.<<node_cluster>>.openstack.proxy
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - cluster.virtual-mcp-pike-dvr.infra.backup.client_mysql
+ - service.galera.master.cluster
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: xenial
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ openstack_control_node03:
+ classes:
+ - cluster.virtual-mcp-pike-dvr.infra.backup.server
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ openstack_compute_node01:
+ params:
+ single_address: 172.16.10.105
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ openstack_compute_node02:
+ params:
+ single_address: 172.16.10.106
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ openstack_proxy_node01:
+ classes:
+ - cluster.virtual-mcp-pike-dvr.openstack.proxy
+ params:
+ linux_system_codename: xenial
diff --git a/classes/cluster/sl-pike-dvr/infra/init.yml b/classes/cluster/sl-pike-dvr/infra/init.yml
new file mode 100644
index 0000000..b01723d
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/sl-pike-dvr/init.yml b/classes/cluster/sl-pike-dvr/init.yml
new file mode 100644
index 0000000..9417b91
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/init.yml
@@ -0,0 +1,56 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.mcp.extra
+- system.linux.system.single
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.sl-pike-dvr.infra
+- cluster.sl-pike-dvr.openstack
+- cluster.sl-pike-dvr.stacklight
+- cluster.overrides
+parameters:
+ _param:
+ cluster_domain: virtual-mcp-pike-dvr.local
+ cluster_name: virtual-mcp-pike-dvr
+ # infra service addresses
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
+ # openstack service addresses
+ openstack_database_address: 172.16.10.254
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ # stacklight service addresses
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/sl-pike-dvr/openstack/compute.yml b/classes/cluster/sl-pike-dvr/openstack/compute.yml
new file mode 100644
index 0000000..460df98
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/compute.yml
@@ -0,0 +1,36 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.linux.network.interface.single_ovs_dvr
+- system.prometheus.exporters.libvirt
+- cluster.sl-pike-dvr
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 1500
+ linux_system_codename: xenial
+ neutron:
+ compute:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ notify_on:
+ state_change: vm_and_task_state
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
new file mode 100644
index 0000000..643c144
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -0,0 +1,140 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.backup
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.sl-pike-dvr
+
+parameters:
+ _param:
+ keepalived_vip_interface: ens4
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 150
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ designate:
+ pool_manager:
+ enabled: ${_param:designate_pool_manager_enabled}
+ periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
+ server:
+ backend:
+ pdns4:
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ mdns:
+ address: ${_param:designate_mdns_address}
+ port: ${_param:designate_mdns_port}
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test 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}
+ quota:
+ zones: ${_param:designate_quota_zones}
+ glance:
+ server:
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ heat:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ neutron:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ metadata:
+ password: ${_param:metadata_password}
+ bind:
+ private_address: ${_param:cluster_local_address}
+ public_address: ${_param:cluster_vip_address}
+ novncproxy_port: 6080
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ cinder:
+ volume:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ controller:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/sl-pike-dvr/openstack/dashboard.yml b/classes/cluster/sl-pike-dvr/openstack/dashboard.yml
new file mode 100644
index 0000000..3d37a7b
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.horizon.server.single
+- cluster.sl-pike-dvr
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/sl-pike-dvr/openstack/dns.yml b/classes/cluster/sl-pike-dvr/openstack/dns.yml
new file mode 100644
index 0000000..f3538c1
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/dns.yml
@@ -0,0 +1,35 @@
+classes:
+- system.powerdns.server.single
+- cluster.sl-pike-dvr
+
+parameters:
+ powerdns:
+ server:
+ api:
+ enabled: True
+ key: ${_param:designate_pdns_api_key}
+ axfr_ips:
+ ${_param:powerdns_axfr_ips}
+ bind:
+ address: ${_param:single_address}
+ overwrite_supermasters: True
+ supermasters:
+ ${_param:powerdns_supermasters}
+ webserver:
+ enabled: True
+ address: ${_param:single_address}
+ password: ${_param:powerdns_webserver_password}
+ port: ${_param:powerdns_webserver_port}
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/sl-pike-dvr/openstack/gateway.yml b/classes/cluster/sl-pike-dvr/openstack/gateway.yml
new file mode 100644
index 0000000..3ac6aac
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/gateway.yml
@@ -0,0 +1,21 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.sl-pike-dvr
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 9000
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ linux_system_codename: xenial
+ neutron:
+ gateway:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/sl-pike-dvr/openstack/init.yml b/classes/cluster/sl-pike-dvr/openstack/init.yml
new file mode 100644
index 0000000..4a7ef7e
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/init.yml
@@ -0,0 +1,217 @@
+parameters:
+ _param:
+ openstack_version: pike
+ apt_mk_version: nightly
+ cinder_version: ${_param:openstack_version}
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ cluster_public_protocol: http
+ neutron_control_dvr: True
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ neutron_compute_dvr: True
+ neutron_compute_agent_mode: dvr
+ neutron_compute_external_access: True
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ galera_innodb_read_io_threads: 2
+ galera_innodb_write_io_threads: 2
+ galera_wsrep_slave_threads: 2
+ galera_xtrabackup_parallel: 1
+ galera_error_log_enabled: true
+ cluster_vip_address: 172.16.10.254
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: 172.16.10.101
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: 172.16.10.102
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: 172.16.10.103
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ powerdns_axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
+ powerdns_supermasters:
+ - ip: ${_param:openstack_control_node01_address}
+ nameserver: ns1.example.org
+ account: master
+ - ip: ${_param:openstack_control_node02_address}
+ nameserver: ns2.example.org
+ account: master
+ - ip: ${_param:openstack_control_node03_address}
+ nameserver: ns3.example.org
+ account: master
+ powerdns_overwrite_supermasters: True
+ powerdns_webserver_password: gJ6n3gVaYP8eS
+ powerdns_webserver_port: 8081
+ designate_admin_api_enabled: true
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_mdns_address: 0.0.0.0
+ designate_mdns_port: 53
+ designate_pdns_api_key: VxK9cMlFL5Ae
+ designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
+ designate_pool_manager_enabled: True
+ designate_pool_manager_periodic_sync_interval: '120'
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ - hostname: 'ns2.example.org.'
+ priority: 20
+ - hostname: 'ns3.example.org.'
+ priority: 30
+ designate_pool_nameservers:
+ - host: ${_param:openstack_dns_node01_address}
+ port: 53
+ - host: ${_param:openstack_dns_node02_address}
+ port: 53
+ designate_pool_target_type: pdns4
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_options:
+ host: ${_param:openstack_dns_node01_address}
+ port: 53
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ designate_quota_zones: 40
+ designate_version: ${_param:openstack_version}
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:cluster_vip_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:cluster_vip_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:cluster_vip_address}
+ heat_domain_admin_password: workshop
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:cluster_vip_address}
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
+ metadata_password: password
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_glance_password: workshop
+ mysql_grafana_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_aodh_password: workshop
+ mysql_designate_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_aodh_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ keystone_designate_password: workshop
+ ceilometer_secret_key: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: cloudlab
+ mongodb_admin_password: cloudlab
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
+ linux:
+ network:
+ purge_hosts: true
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - prx
+ - prx.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - prx01
+ - prx01.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ctl
+ - ctl.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ctl01
+ - ctl01.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ctl02
+ - ctl02.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ctl03
+ - ctl03.${_param:cluster_domain}
+ gtw01:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - gtw01
+ - gtw01.${_param:cluster_domain}
+ cmp01:
+ address: 172.16.10.105
+ names:
+ - cmp01
+ - cmp01.${_param:cluster_domain}
+ cmp02:
+ address: 172.16.10.106
+ names:
+ - cmp02
+ - cmp02.${_param:cluster_domain}
+ dns01:
+ address: ${_param:openstack_dns_node01_address}
+ names:
+ - dns01
+ - dns01.${_param:cluster_domain}
+ dns02:
+ address: ${_param:openstack_dns_node02_address}
+ names:
+ - dns02
+ - dns02.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/sl-pike-dvr/openstack/proxy.yml b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
new file mode 100644
index 0000000..507d1e5
--- /dev/null
+++ b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.sl-pike-dvr
+parameters:
+ _param:
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/client.yml b/classes/cluster/sl-pike-dvr/stacklight/client.yml
similarity index 73%
rename from classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/client.yml
rename to classes/cluster/sl-pike-dvr/stacklight/client.yml
index 6417052..4988908 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/client.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/client.yml
@@ -4,7 +4,6 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
-- cluster.virtual-mcp-pike-dvr-ssl
parameters:
_param:
# Elasticsearch/Kibana client parameters
@@ -16,3 +15,7 @@
grafana_password: ${_param:grafana_admin_password}
grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15016
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml b/classes/cluster/sl-pike-dvr/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml
rename to classes/cluster/sl-pike-dvr/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/proxy.yml b/classes/cluster/sl-pike-dvr/stacklight/proxy.yml
similarity index 83%
rename from classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/proxy.yml
rename to classes/cluster/sl-pike-dvr/stacklight/proxy.yml
index 6a71843..957e5cb 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/proxy.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/proxy.yml
@@ -5,7 +5,7 @@
- system.nginx.server.proxy.monitoring.prometheus_server
- system.nginx.server.proxy.monitoring.prometheus_alertmanager
- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-pike-dvr-ssl
+- cluster.sl-pike-dvr
parameters:
_param:
nginx_proxy_grafana_port: 15013
@@ -14,4 +14,4 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${linux:system:domain}
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
similarity index 88%
rename from classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/server.yml
rename to classes/cluster/sl-pike-dvr/stacklight/server.yml
index 96f565c..a6e2477 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -26,10 +26,10 @@
- system.prometheus.server.remote_write.docker
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
- system.docker.swarm.stack.monitoring.remote_collector
- system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-pike-dvr-ssl
+- cluster.sl-pike-dvr
parameters:
_param:
heka_amqp_host: ${_param:openstack_control_address}
@@ -41,6 +41,12 @@
cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
+ cluster_node01_hostname: mon01
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: mon02
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: mon03
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
index f65ab4c..5a4688c 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
@@ -47,7 +47,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
index f8444d9..64c6729 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
@@ -47,7 +47,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
index 83d80d9..70090a5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
@@ -11,7 +11,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
index f406a42..83cd6b8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
index c1ef8c6..f0ff1a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
@@ -7,6 +7,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index cbffebb..a339f4b 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index 582837d..1f70a17 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
index e67ef52..4366424 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
@@ -11,7 +11,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
index 39f1b33..b3b3c76 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
index 5affb23..d66af7f 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
@@ -7,6 +7,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
index c4607b6..95c3bc6 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -11,7 +11,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index 0467708..3fb6af4 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
index 0d296ba..ead583b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
@@ -6,6 +6,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index b56b9ac..0b8aa98 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index aa01aec..ccef4f2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -6,6 +6,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
index 318a318..857c6e5 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
@@ -11,7 +11,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
new file mode 100644
index 0000000..c74228a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
@@ -0,0 +1,26 @@
+parameters:
+ _param:
+ haproxy_radosgw_bind_port: 8080
+ haproxy_radosgw_source_port: 8080
+ haproxy:
+ proxy:
+ listen:
+ radosgw:
+ mode: tcp
+ balance: source
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: ${_param:haproxy_radosgw_bind_port}
+ servers:
+ - name: ${_param:ceph_rgw_node01_hostname}
+ host: ${_param:ceph_rgw_node01_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
+ - name: ${_param:ceph_rgw_node02_hostname}
+ host: ${_param:ceph_rgw_node02_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
+ - name: ${_param:ceph_rgw_node03_hostname}
+ host: ${_param:ceph_rgw_node03_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index 412a79c..c42e143 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
index c99924a..68d37ba 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index cc9f9f8..e5f0e64 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -34,6 +34,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.rgwproxy
- system.glance.control.storage.ceph
- system.ceph.common.cluster
- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
index a21572d..062d79b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
@@ -52,7 +52,7 @@
docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
new file mode 100644
index 0000000..11849f2
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
new file mode 100644
index 0000000..368b52b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -0,0 +1,214 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.master.api
+- system.salt.master.formula.pkg.manila
+- system.salt.master.formula.pkg.gnocchi
+- system.salt.master.formula.pkg.panko
+# Add when reclass bumped
+#-salt/master/formula/pkg/dogtag.yml
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.panko
+- system.keystone.client.service.gnocchi
+- system.keystone.client.service.barbican
+- system.reclass.storage.system.openstack_dns_cluster
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_share_single
+- system.reclass.storage.system.openstack_telemetry_cluster
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ reclass_config_master: 192.168.10.90
+ single_address: 172.16.10.100
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ environment:
+ prd:
+ formula:
+ dogtag:
+ source: pkg
+ name: salt-formula-dogtag
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ - cluster.<<node_cluster>>.openstack.proxy
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
+ value_template: <<node_tenant_ip>>
+ openstack_telemetry01:
+ expression: <<node_hostname>>__equals__mdb01
+ cluster_param:
+ openstack_telemetry_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry02:
+ expression: <<node_hostname>>__equals__mdb02
+ cluster_param:
+ openstack_telemetry_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry03:
+ expression: <<node_hostname>>__equals__mdb03
+ cluster_param:
+ openstack_telemetry_node03_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ - service.dogtag.server.cluster.master
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: xenial
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ - service.dogtag.server.cluster.slave
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ - service.dogtag.server.cluster.slave
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ openstack_compute_node01:
+ params:
+ single_address: 172.16.10.105
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ openstack_compute_node02:
+ params:
+ single_address: 172.16.10.106
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ openstack_proxy_node01:
+ classes:
+ - cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack.proxy
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ # create resources only from 1 controller
+ # to prevent race conditions
+ ceilometer_create_gnocchi_resources: true
+ redis_cluster_role: 'master'
+ openstack_telemetry_node02:
+ params:
+ redis_cluster_role: 'slave'
+ openstack_telemetry_node03:
+ params:
+ redis_cluster_role: 'slave'
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/init.yml
new file mode 100644
index 0000000..b01723d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml
new file mode 100644
index 0000000..8a7241f
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml
@@ -0,0 +1,23 @@
+classes:
+- system.linux.network.dynamic_hosts
+- system.linux.system.repo.mcp.extra
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp-pike-dvr-ssl-barbican.infra
+- cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack
+- cluster.overrides
+parameters:
+ _param:
+ cluster_domain: virtual-mcp-pike-dvr-ssl.local
+ cluster_name: virtual-mcp-pike-dvr-ssl
+ salt_minion_ca_host: cfg01.${linux:system:domain}
+ # infra service addresses
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
new file mode 100644
index 0000000..65bcbeb
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -0,0 +1,54 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.hosts
+- system.linux.storage.loopback
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.client.nova_compute
+- system.ceilometer.agent.cluster
+- system.ceilometer.agent.polling.default
+- system.linux.network.interface.single_ovs_dvr
+- service.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 1500
+ linux_system_codename: xenial
+ loopback_device_size: 20
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ identity:
+ protocol: https
+ network:
+ protocol: https
+ glance:
+ protocol: https
+ image:
+ protocol: https
+ neutron:
+ compute:
+ notification:
+ driver: messagingv2
+ topics: "notifications"
+ cinder:
+ volume:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
new file mode 100644
index 0000000..5d20cee
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -0,0 +1,307 @@
+classes:
+- system.salt.minion.cert.proxy
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.apache.server.site.manila
+- system.apache.server.site.barbican
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack.designate
+- system.nginx.server.proxy.openstack.placement
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.designate.server.cluster
+- system.galera.server.cluster
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- system.galera.server.database.manila
+- system.galera.server.database.aodh
+- system.galera.server.database.panko
+- system.galera.server.database.gnocchi
+- system.galera.server.database.barbican
+- system.dogtag.server.cluster
+- system.barbican.server.cluster
+- service.barbican.server.plugin.dogtag
+- system.ceilometer.client
+- system.ceilometer.client.cinder_volume
+- system.ceilometer.client.neutron
+- cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack.dns
+- system.haproxy.proxy.listen.openstack.placement
+- system.haproxy.proxy.listen.openstack.manila
+- system.manila.control.cluster
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ keepalived_vip_interface: ens4
+ salt_minion_ca_authority: salt_master_ca
+ ### nginx ssl sites settings
+ nginx_proxy_ssl:
+ enabled: true
+ engine: salt
+ authority: "${_param:salt_minion_ca_authority}"
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_keystone_host: 127.0.0.1
+ nginx_proxy_openstack_nova_host: 127.0.0.1
+ nginx_proxy_openstack_cinder_host: 127.0.0.1
+ nginx_proxy_openstack_glance_host: 127.0.0.1
+ nginx_proxy_openstack_neutron_host: 127.0.0.1
+ nginx_proxy_openstack_heat_host: 127.0.0.1
+ nginx_proxy_openstack_designate_host: 127.0.0.1
+ nginx_proxy_openstack_placement_host: 127.0.0.1
+ apache_manila_api_address: ${_param:single_address}
+ apache_manila_ssl: ${_param:nginx_proxy_ssl}
+ apache_keystone_api_host: ${_param:single_address}
+ apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+ apache_barbican_api_address: ${_param:cluster_local_address}
+ apache_barbican_api_host: ${_param:single_address}
+ apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ barbican_dogtag_nss_password: workshop
+ barbican_dogtag_host: ${_param:cluster_vip_address}
+ # dogtag listens on 8443 but there is no way to bind it to
+ # Specific IP, as on this setup dogtag installed on ctl nodes
+ # Change port on haproxy side to avoid binding conflict.
+ haproxy_dogtag_bind_port: 8444
+ cluster_dogtag_port: 8443
+ dogtag_master_host: ctl01.${linux:system:domain}
+ dogtag_pki_admin_password: workshop
+ dogtag_pki_client_database_password: workshop
+ dogtag_pki_client_pkcs12_password: workshop
+ dogtag_pki_ds_password: workshop
+ dogtag_pki_token_password: workshop
+ dogtag_pki_security_domain_password: workshop
+ dogtag_pki_clone_pkcs12_password: workshop
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_api_keystone:
+ enabled: false
+ nginx_proxy_openstack_api_keystone_private:
+ enabled: false
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 150
+ dogtag:
+ server:
+ ldap_hostname: ${linux:network:fqdn}
+ ldap_dn_password: workshop
+ ldap_admin_password: workshop
+ export_pem_file_path: /etc/dogtag/kra_admin_cert.pem
+ # TODO drop this once reclass bumped, missing part in current version
+ apache:
+ server:
+ site:
+ barbican_admin:
+ host:
+ address: ${_param:apache_barbican_api_address}
+ name: ${_param:apache_barbican_api_host}
+ port: 9312
+ log:
+ custom:
+ format: 'combined'
+ file: '/var/log/barbican/barbican-api.log'
+ error:
+ enabled: true
+ file: '/var/log/barbican/barbican-api.log'
+ barbican:
+ server:
+ enabled: true
+ dogtag_admin_cert:
+ engine: mine
+ minion: ${_param:dogtag_master_host}
+ ks_notifications_enable: True
+ store:
+ software:
+ store_plugin: dogtag_crypto
+ global_default: True
+ plugin:
+ dogtag:
+ port: ${_param:haproxy_dogtag_bind_port}
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ designate:
+ pool_manager:
+ enabled: ${_param:designate_pool_manager_enabled}
+ periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
+ server:
+ identity:
+ protocol: https
+ bind:
+ api:
+ address: 127.0.0.1
+ backend:
+ pdns4:
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ mdns:
+ address: ${_param:designate_mdns_address}
+ port: ${_param:designate_mdns_port}
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test 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}
+ quota:
+ zones: ${_param:designate_quota_zones}
+ glance:
+ server:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ bind:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ registry:
+ protocol: https
+ heat:
+ server:
+ bind:
+ api:
+ address: 127.0.0.1
+ api_cfn:
+ address: 127.0.0.1
+ api_cloudwatch:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ neutron:
+ server:
+ bind:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ metadata:
+ password: ${_param:metadata_password}
+ bind:
+ public_address: ${_param:cluster_vip_address}
+ novncproxy_port: 6080
+ private_address: 127.0.0.1
+ identity:
+ protocol: https
+ network:
+ protocol: https
+ glance:
+ protocol: https
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ cinder:
+ controller:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ identity:
+ protocol: https
+ osapi:
+ host: 127.0.0.1
+ glance:
+ protocol: https
+ manila:
+ common:
+ identity:
+ protocol: https
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ haproxy:
+ proxy:
+ listen:
+ barbican-api:
+ type: ~
+ barbican-admin-api:
+ type: ~
+ designate_api:
+ type: ~
+ keystone_public_api:
+ type: ~
+ keystone_admin_api:
+ type: ~
+ manila_api:
+ type: ~
+ nova_api:
+ type: ~
+ nova_metadata_api:
+ type: ~
+ cinder_api:
+ type: ~
+ glance_api:
+ type: ~
+ glance_registry_api:
+ type: ~
+ heat_cloudwatch_api:
+ type: ~
+ heat_api:
+ type: ~
+ heat_cfn_api:
+ type: ~
+ neutron_api:
+ type: ~
+ placement_api:
+ type: ~
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml
new file mode 100644
index 0000000..c1f597b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.horizon.server.single
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dns.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dns.yml
new file mode 100644
index 0000000..a16c8d6
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dns.yml
@@ -0,0 +1,35 @@
+classes:
+- system.powerdns.server.single
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+
+parameters:
+ powerdns:
+ server:
+ api:
+ enabled: True
+ key: ${_param:designate_pdns_api_key}
+ axfr_ips:
+ ${_param:powerdns_axfr_ips}
+ bind:
+ address: ${_param:single_address}
+ overwrite_supermasters: True
+ supermasters:
+ ${_param:powerdns_supermasters}
+ webserver:
+ enabled: True
+ address: ${_param:single_address}
+ password: ${_param:powerdns_webserver_password}
+ port: ${_param:powerdns_webserver_port}
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dogtag.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dogtag.yml
new file mode 100644
index 0000000..c9d90c0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dogtag.yml
@@ -0,0 +1,67 @@
+classes:
+#- system.apache.server.site.barbican
+- system.dogtag.server.cluster
+- system.barbican.server.cluster
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ apache_barbican_api_address: ${_param:cluster_local_address}
+ apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_manila_ssl: ${_param:nginx_proxy_ssl}
+ barbican_dogtag_nss_password: workshop
+ barbican_dogtag_host: ${_param:cluster_vip_address}
+ # dogtag listens on 8443 but there is no way to bind it to
+ # Specific IP, as on this setup dogtag installed on ctl nodes
+ # Change port on haproxy side to avoid binding conflict.
+ haproxy_dogtag_bind_port: 8444
+ cluster_dogtag_port: 8443
+ dogtag_master_host: ctl01.${linux:system:domain}
+ dogtag:
+ server:
+ ldap_hostname: ${linux:network:fqdn}
+ ldap_dn_password: workshop
+ export_pem_file_path: /etc/dogtag/kra_admin_cert.pem
+ default_config_options:
+ pki_ds_hostname: ${linux:network:fqdn}
+ pki_admin_password: workshop
+ pki_backup_password: workshop
+ pki_client_database_password: workshop
+ pki_client_pkcs12_password: workshop
+ pki_clone_pkcs12_password: workshop
+ pki_ds_password: workshop
+ pki_token_password: workshop
+ pki_security_domain_name: EXAMPLE
+ pki_security_domain_password: workshop
+ barbican:
+ server:
+ enabled: true
+ dogtag_admin_cert:
+ engine: mine
+ minion: ${_param:dogtag_master_host}
+ ks_notifications_enable: True
+ store:
+ software:
+ store_plugin: dogtag_crypto
+ global_default: True
+ plugin:
+ dogtag:
+ port: ${_param:haproxy_dogtag_bind_port}
+ glance:
+ server:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ nova:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ cinder:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ haproxy:
+ proxy:
+ listen:
+ barbican-api:
+ type: ~
+ barbican-admin-api:
+ type: ~
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
new file mode 100644
index 0000000..81e8754
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
@@ -0,0 +1,30 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 9000
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ linux_system_codename: xenial
+ neutron:
+ gateway:
+ notification:
+ driver: messagingv2
+ topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
new file mode 100644
index 0000000..18ab132
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -0,0 +1,282 @@
+parameters:
+ _param:
+ # openstack service addresses
+ openstack_database_address: 172.16.10.254
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
+ openstack_telemetry_address: 172.16.10.250
+ openstack_telemetry_node01_address: 172.16.10.45
+ openstack_telemetry_node02_address: 172.16.10.46
+ openstack_telemetry_node03_address: 172.16.10.47
+ openstack_telemetry_system_codename: xenial
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_telemetry_keepalived_password: hf9GQOjG2uPhkJ2Q
+
+ openstack_version: pike
+ apt_mk_version: nightly
+ cinder_version: ${_param:openstack_version}
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_host: 172.16.10.254
+ telemetry_public_host: ${_param:openstack_telemetry_address}
+ cluster_public_protocol: https
+ cluster_internal_protocol: https
+ keystone_service_protocol: ${_param:cluster_internal_protocol}
+ glance_service_protocol: ${_param:cluster_internal_protocol}
+ nova_service_protocol: ${_param:cluster_internal_protocol}
+ neutron_service_protocol: ${_param:cluster_internal_protocol}
+ heat_service_protocol: ${_param:cluster_internal_protocol}
+ cinder_service_protocol: ${_param:cluster_internal_protocol}
+ designate_service_protocol: ${_param:cluster_internal_protocol}
+ manila_service_protocol: ${_param:cluster_internal_protocol}
+ ceilometer_service_protocol: ${_param:cluster_internal_protocol}
+ panko_service_protocol: ${_param:cluster_internal_protocol}
+ aodh_service_protocol: ${_param:cluster_internal_protocol}
+ gnocchi_service_protocol: ${_param:cluster_internal_protocol}
+ barbican_service_protocol: ${_param:cluster_internal_protocol}
+ neutron_control_dvr: True
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ neutron_compute_dvr: True
+ neutron_compute_agent_mode: dvr
+ neutron_compute_external_access: True
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ galera_innodb_read_io_threads: 2
+ galera_innodb_write_io_threads: 2
+ galera_wsrep_slave_threads: 2
+ galera_xtrabackup_parallel: 1
+ galera_error_log_enabled: true
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ powerdns_axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
+ powerdns_supermasters:
+ - ip: ${_param:openstack_control_node01_address}
+ nameserver: ns1.example.org
+ account: master
+ - ip: ${_param:openstack_control_node02_address}
+ nameserver: ns2.example.org
+ account: master
+ - ip: ${_param:openstack_control_node03_address}
+ nameserver: ns3.example.org
+ account: master
+ powerdns_overwrite_supermasters: True
+ powerdns_webserver_password: gJ6n3gVaYP8eS
+ powerdns_webserver_port: 8081
+ designate_admin_api_enabled: true
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_mdns_address: 0.0.0.0
+ designate_mdns_port: 53
+ designate_pdns_api_key: VxK9cMlFL5Ae
+ designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
+ designate_pool_manager_enabled: True
+ designate_pool_manager_periodic_sync_interval: '120'
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ - hostname: 'ns2.example.org.'
+ priority: 20
+ - hostname: 'ns3.example.org.'
+ priority: 30
+ designate_pool_nameservers:
+ - host: ${_param:openstack_dns_node01_address}
+ port: 53
+ - host: ${_param:openstack_dns_node02_address}
+ port: 53
+ designate_pool_target_type: pdns4
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_options:
+ host: ${_param:openstack_dns_node01_address}
+ port: 53
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ designate_quota_zones: 40
+ designate_version: ${_param:openstack_version}
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:cluster_vip_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:cluster_vip_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:cluster_vip_address}
+ heat_domain_admin_password: workshop
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ manila_version: ${_param:openstack_version}
+ manila_service_host: ${_param:cluster_vip_address}
+ panko_version: ${_param:openstack_version}
+ panko_service_host: ${_param:openstack_telemetry_address}
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_telemetry_address}
+ barbican_service_host: ${_param:cluster_vip_address}
+ barbican_version: ${_param:openstack_version}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_version: 4.0
+ gnocchi_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_public_host: ${_param:telemetry_public_host}
+ aodh_public_host: ${_param:telemetry_public_host}
+ ceilometer_public_host: ${_param:telemetry_public_host}
+ panko_public_host: ${_param:telemetry_public_host}
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
+ metadata_password: password
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_glance_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_designate_password: workshop
+ mysql_manila_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_panko_password: workshop
+ mysql_aodh_password: workshop
+ mysql_gnocchi_password: workshop
+ mysql_barbican_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ keystone_designate_password: workshop
+ keystone_manila_password: workshop
+ keystone_aodh_password: workshop
+ keystone_panko_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_gnocchi_password: workshop
+ keystone_barbican_password: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ ceilometer_secret_key: workshop
+ ceilometer_agent_default_polling_interval: 15
+ ceilometer_agent_default_polling_meters:
+ - "*"
+ barbican_integration_enabled: true
+ linux:
+ network:
+ purge_hosts: true
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - prx
+ - prx.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - prx01
+ - prx01.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ctl
+ - ctl.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ctl01
+ - ctl01.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ctl02
+ - ctl02.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ctl03
+ - ctl03.${_param:cluster_domain}
+ gtw01:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - gtw01
+ - gtw01.${_param:cluster_domain}
+ cmp01:
+ address: 172.16.10.105
+ names:
+ - cmp01
+ - cmp01.${_param:cluster_domain}
+ cmp02:
+ address: 172.16.10.106
+ names:
+ - cmp02
+ - cmp02.${_param:cluster_domain}
+ dns01:
+ address: ${_param:openstack_dns_node01_address}
+ names:
+ - dns01
+ - dns01.${_param:cluster_domain}
+ dns02:
+ address: ${_param:openstack_dns_node02_address}
+ names:
+ - dns02
+ - dns02.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
new file mode 100644
index 0000000..074dd4f
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
new file mode 100644
index 0000000..93a106e
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
@@ -0,0 +1,16 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.storage.loopback_manila
+- system.manila.share
+- system.manila.share.backend.lvm
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ manila_lvm_devices:
+ - /dev/loop0
+ loopback_device1_size: 20
+ manila:
+ common:
+ identity:
+ protocol: https
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
new file mode 100644
index 0000000..eee65de
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -0,0 +1,158 @@
+classes:
+- system.salt.minion.cert.proxy
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.memcached.server.single
+- system.apache.server.single
+- system.apache.server.site.gnocchi
+- system.apache.server.site.panko
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.gnocchi
+- system.glusterfs.server.volume.gnocchi
+- service.redis.server.single
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
+- system.gnocchi.server.cluster
+- system.gnocchi.common.storage.incoming.redis
+- system.gnocchi.common.storage.file
+- system.gnocchi.common.coordination.redis
+- system.ceilometer.server.cluster
+- system.ceilometer.server.coordination.redis
+- system.aodh.server.cluster
+- system.aodh.server.coordination.redis
+- system.panko.server.cluster
+- system.ceilometer.server.backend.default
+- cluster.virtual-mcp-pike-dvr-ssl-barbican
+parameters:
+ _param:
+ salt_minion_ca_authority: salt_master_ca
+ keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
+ keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
+ keepalived_openstack_telemetry_vip_interface: ens3
+ cluster_vip_address: ${_param:openstack_telemetry_address}
+ cluster_local_address: ${_param:single_address}
+ nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_ceilometer_host: 127.0.0.1
+ nginx_proxy_openstack_aodh_host: 127.0.0.1
+ nginx_proxy_ssl:
+ enabled: true
+ engine: salt
+ authority: "${_param:salt_minion_ca_authority}"
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ apache_gnocchi_api_address: ${_param:single_address}
+ apache_panko_api_address: ${_param:single_address}
+ apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
+ apache_panko_ssl: ${_param:nginx_proxy_ssl}
+ cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
+ cluster_node01_address: ${_param:openstack_telemetry_node01_address}
+ cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
+ cluster_node02_address: ${_param:openstack_telemetry_node02_address}
+ cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname}
+ cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ glusterfs_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_glusterfs_service_host: ${_param:glusterfs_service_host}
+ redis_sentinel_node01_address: ${_param:openstack_telemetry_node01_address}
+ redis_sentinel_node02_address: ${_param:openstack_telemetry_node02_address}
+ redis_sentinel_node03_address: ${_param:openstack_telemetry_node03_address}
+ openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
+ gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
+ gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:openstack_telemetry_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:openstack_telemetry_address}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 160
+ redis:
+ server:
+ version: 3.0
+ bind:
+ address: ${_param:single_address}
+ cluster:
+ enabled: True
+ mode: sentinel
+ role: ${_param:redis_cluster_role}
+ quorum: 2
+ master:
+ host: ${_param:cluster_node01_address}
+ port: 6379
+ sentinel:
+ address: ${_param:single_address}
+ apache:
+ server:
+ modules:
+ - wsgi
+ gnocchi:
+ common:
+ database:
+ host: ${_param:openstack_database_address}
+ server:
+ identity:
+ protocol: https
+ pkgs:
+ # TODO: move python-memcache installation to formula
+ - gnocchi-api
+ - gnocchi-metricd
+ - python-memcache
+ panko:
+ server:
+ identity:
+ protocol: https
+ aodh:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ ceilometer:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ haproxy:
+ proxy:
+ listen:
+ panko_api:
+ type: ~
+ ceilometer_api:
+ type: ~
+ gnocchi_api:
+ type: ~
+ aodh-api:
+ type: ~
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 729d44f..e88a093 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -1,30 +1,36 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
+- system.salt.master.formula.pkg.manila
+- system.salt.master.formula.pkg.gnocchi
+- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.single
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
-- system.mysql.client.single
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.panko
+- system.keystone.client.service.gnocchi
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
-- cluster.virtual-mcp-pike-dvr-ssl.stacklight.proxy
+- system.reclass.storage.system.openstack_share_single
+- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
_param:
@@ -46,14 +52,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: ${_param:openstack_proxy_address}
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
reactor:
@@ -118,21 +116,6 @@
cluster_param:
openstack_gateway_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor_node01:
- expression: <<node_hostname>>__equals__mon01
- cluster_param:
- stacklight_monitor_node01_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node02:
- expression: <<node_hostname>>__equals__mon02
- cluster_param:
- stacklight_monitor_node02_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node03:
- expression: <<node_hostname>>__equals__mon03
- cluster_param:
- stacklight_monitor_node03_address:
- value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -142,6 +125,31 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
+ value_template: <<node_tenant_ip>>
+ openstack_telemetry01:
+ expression: <<node_hostname>>__equals__mdb01
+ cluster_param:
+ openstack_telemetry_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry02:
+ expression: <<node_hostname>>__equals__mdb02
+ cluster_param:
+ openstack_telemetry_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry03:
+ expression: <<node_hostname>>__equals__mdb03
+ cluster_param:
+ openstack_telemetry_node03_address:
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes:
@@ -161,10 +169,6 @@
params:
mysql_cluster_role: slave
linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
openstack_compute_node01:
params:
single_address: 172.16.10.105
@@ -184,3 +188,15 @@
- cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
params:
linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ # create resources only from 1 controller
+ # to prevent race conditions
+ ceilometer_create_gnocchi_resources: true
+ redis_cluster_role: 'master'
+ openstack_telemetry_node02:
+ params:
+ redis_cluster_role: 'slave'
+ openstack_telemetry_node03:
+ params:
+ redis_cluster_role: 'slave'
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index 9d49da0..5b47776 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -1,23 +1,14 @@
classes:
- system.linux.network.dynamic_hosts
-- service.grafana.collector
-- system.fluentd
-- system.fluentd.label.default_metric
-- system.fluentd.label.default_metric.prometheus
-- system.fluentd.label.default_output.elasticsearch
-- system.fluentd.label.default_output.drop_event
- system.linux.system.repo.mcp.extra
- system.linux.system.single
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.single.debian
- system.rsyslog.client.single
-- system.prometheus.collector
-- system.telegraf.agent
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
- cluster.virtual-mcp-pike-dvr-ssl.infra
- cluster.virtual-mcp-pike-dvr-ssl.openstack
-- cluster.virtual-mcp-pike-dvr-ssl.stacklight
- cluster.overrides
parameters:
_param:
@@ -27,14 +18,6 @@
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
salt:
minion:
trusted_ca_minions:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 71d7103..089a3cd 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -5,9 +5,10 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.ceilometer.client.nova_compute
- system.ceilometer.agent.cluster
+- system.ceilometer.agent.polling.default
- system.linux.network.interface.single_ovs_dvr
-- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
_param:
@@ -16,19 +17,18 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
- neutron:
- compute:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- notify_on:
- state_change: vm_and_task_state
identity:
protocol: https
network:
@@ -36,4 +36,9 @@
glance:
protocol: https
image:
- protocol: https
\ No newline at end of file
+ protocol: https
+ neutron:
+ compute:
+ notification:
+ driver: messagingv2
+ topics: "notifications"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 8f26b0d..d254cdb 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -8,6 +8,7 @@
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
+- system.apache.server.site.manila
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
@@ -25,23 +26,25 @@
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
-- system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
-- system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
- system.designate.server.cluster
- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
-- system.galera.server.database.grafana
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
+- system.galera.server.database.manila
+- system.galera.server.database.aodh
+- system.galera.server.database.panko
+- system.galera.server.database.gnocchi
+- system.ceilometer.client
+- system.ceilometer.client.cinder_volume
+- system.ceilometer.client.neutron
- cluster.virtual-mcp-pike-dvr-ssl.openstack.dns
- system.haproxy.proxy.listen.openstack.placement
+- system.haproxy.proxy.listen.openstack.manila
+- system.manila.control.cluster
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
@@ -65,6 +68,8 @@
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
nginx_proxy_openstack_placement_host: 127.0.0.1
+ apache_manila_api_address: ${_param:single_address}
+ apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
apache_keystone_ssl: ${_param:nginx_proxy_ssl}
nginx:
@@ -95,9 +100,6 @@
keystone:
server:
admin_email: ${_param:admin_email}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
designate:
pool_manager:
enabled: ${_param:designate_pool_manager_enabled}
@@ -138,9 +140,6 @@
engine: file
images: []
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
bind:
address: 127.0.0.1
identity:
@@ -149,9 +148,6 @@
protocol: https
heat:
server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
bind:
api:
address: 127.0.0.1
@@ -163,9 +159,6 @@
protocol: https
neutron:
server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
bind:
address: 127.0.0.1
identity:
@@ -188,24 +181,18 @@
protocol: https
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
cinder:
- volume:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
controller:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
identity:
protocol: https
osapi:
host: 127.0.0.1
glance:
protocol: https
+ manila:
+ common:
+ identity:
+ protocol: https
salt:
minion:
cert:
@@ -231,6 +218,8 @@
type: ~
keystone_admin_api:
type: ~
+ manila_api:
+ type: ~
nova_api:
type: ~
nova_metadata_api:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
index 55d065c..5dbb948 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
@@ -18,4 +18,13 @@
gateway:
notification:
driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
+ topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 4d24b2a..9a72e92 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -8,6 +8,7 @@
openstack_control_node01_hostname: ctl01
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
openstack_control_node01_address: 172.16.10.101
openstack_control_node02_address: 172.16.10.102
openstack_control_node03_address: 172.16.10.103
@@ -23,6 +24,18 @@
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
+ openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
+ openstack_telemetry_address: 172.16.10.250
+ openstack_telemetry_node01_address: 172.16.10.45
+ openstack_telemetry_node02_address: 172.16.10.46
+ openstack_telemetry_node03_address: 172.16.10.47
+ openstack_telemetry_system_codename: xenial
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_telemetry_keepalived_password: hf9GQOjG2uPhkJ2Q
openstack_version: pike
apt_mk_version: nightly
@@ -31,6 +44,7 @@
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_host: 172.16.10.254
+ telemetry_public_host: ${_param:openstack_telemetry_address}
cluster_public_protocol: https
cluster_internal_protocol: https
keystone_service_protocol: ${_param:cluster_internal_protocol}
@@ -40,6 +54,11 @@
heat_service_protocol: ${_param:cluster_internal_protocol}
cinder_service_protocol: ${_param:cluster_internal_protocol}
designate_service_protocol: ${_param:cluster_internal_protocol}
+ manila_service_protocol: ${_param:cluster_internal_protocol}
+ ceilometer_service_protocol: ${_param:cluster_internal_protocol}
+ panko_service_protocol: ${_param:cluster_internal_protocol}
+ aodh_service_protocol: ${_param:cluster_internal_protocol}
+ gnocchi_service_protocol: ${_param:cluster_internal_protocol}
neutron_control_dvr: True
neutron_tenant_network_types: "flat,vxlan"
neutron_l3_ha: False
@@ -130,14 +149,22 @@
heat_version: ${_param:openstack_version}
heat_service_host: ${_param:cluster_vip_address}
heat_domain_admin_password: workshop
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:cluster_vip_address}
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:cluster_vip_address}
+ manila_version: ${_param:openstack_version}
+ manila_service_host: ${_param:cluster_vip_address}
+ panko_version: ${_param:openstack_version}
+ panko_service_host: ${_param:openstack_telemetry_address}
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_telemetry_address}
aodh_version: ${_param:openstack_version}
- aodh_service_host: ${_param:cluster_vip_address}
- ceilometer_graphite_publisher_host: 172.16.10.107
- ceilometer_graphite_publisher_port: 2013
+ aodh_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_version: 4.0
+ gnocchi_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_public_host: ${_param:telemetry_public_host}
+ aodh_public_host: ${_param:telemetry_public_host}
+ ceilometer_public_host: ${_param:telemetry_public_host}
+ panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -149,19 +176,19 @@
mysql_admin_user: root
mysql_admin_password: workshop
mysql_cinder_password: workshop
- mysql_ceilometer_password: workshop
mysql_glance_password: workshop
- mysql_grafana_password: workshop
mysql_heat_password: workshop
mysql_keystone_password: workshop
mysql_neutron_password: workshop
mysql_nova_password: workshop
- mysql_aodh_password: workshop
mysql_designate_password: workshop
+ mysql_manila_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_panko_password: workshop
+ mysql_aodh_password: workshop
+ mysql_gnocchi_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
- keystone_aodh_password: workshop
- keystone_ceilometer_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
keystone_heat_password: workshop
@@ -169,19 +196,20 @@
keystone_neutron_password: workshop
keystone_nova_password: workshop
keystone_designate_password: workshop
- ceilometer_secret_key: workshop
+ keystone_manila_password: workshop
+ keystone_aodh_password: workshop
+ keystone_panko_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_gnocchi_password: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: cloudlab
- mongodb_admin_password: cloudlab
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- ceilometer_influxdb_password: lmapass
- openstack_log_appender: true
- openstack_fluentd_handler_enabled: true
+ ceilometer_secret_key: workshop
+ ceilometer_agent_default_polling_interval: 15
+ ceilometer_agent_default_polling_meters:
+ - "*"
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
new file mode 100644
index 0000000..a631079
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
@@ -0,0 +1,25 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.storage.loopback_manila
+- system.manila.share
+- system.manila.share.backend.lvm
+- cluster.virtual-mcp-pike-dvr-ssl
+parameters:
+ _param:
+ manila_lvm_devices:
+ - /dev/loop0
+ loopback_device1_size: 20
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ manila:
+ common:
+ identity:
+ protocol: https
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
new file mode 100644
index 0000000..bd00035
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -0,0 +1,158 @@
+classes:
+- system.salt.minion.cert.proxy
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.memcached.server.single
+- system.apache.server.single
+- system.apache.server.site.gnocchi
+- system.apache.server.site.panko
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.gnocchi
+- system.glusterfs.server.volume.gnocchi
+- service.redis.server.single
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
+- system.gnocchi.server.cluster
+- system.gnocchi.common.storage.incoming.redis
+- system.gnocchi.common.storage.file
+- system.gnocchi.common.coordination.redis
+- system.ceilometer.server.cluster
+- system.ceilometer.server.coordination.redis
+- system.aodh.server.cluster
+- system.aodh.server.coordination.redis
+- system.panko.server.cluster
+- system.ceilometer.server.backend.default
+- cluster.virtual-mcp-pike-dvr-ssl
+parameters:
+ _param:
+ salt_minion_ca_authority: salt_master_ca
+ keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
+ keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
+ keepalived_openstack_telemetry_vip_interface: ens3
+ cluster_vip_address: ${_param:openstack_telemetry_address}
+ cluster_local_address: ${_param:single_address}
+ nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_ceilometer_host: 127.0.0.1
+ nginx_proxy_openstack_aodh_host: 127.0.0.1
+ nginx_proxy_ssl:
+ enabled: true
+ engine: salt
+ authority: "${_param:salt_minion_ca_authority}"
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ apache_gnocchi_api_address: ${_param:single_address}
+ apache_panko_api_address: ${_param:single_address}
+ apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
+ apache_panko_ssl: ${_param:nginx_proxy_ssl}
+ cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
+ cluster_node01_address: ${_param:openstack_telemetry_node01_address}
+ cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
+ cluster_node02_address: ${_param:openstack_telemetry_node02_address}
+ cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname}
+ cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ glusterfs_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_glusterfs_service_host: ${_param:glusterfs_service_host}
+ redis_sentinel_node01_address: ${_param:openstack_telemetry_node01_address}
+ redis_sentinel_node02_address: ${_param:openstack_telemetry_node02_address}
+ redis_sentinel_node03_address: ${_param:openstack_telemetry_node03_address}
+ openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
+ gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
+ gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:openstack_telemetry_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:openstack_telemetry_address}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 160
+ redis:
+ server:
+ version: 3.0
+ bind:
+ address: ${_param:single_address}
+ cluster:
+ enabled: True
+ mode: sentinel
+ role: ${_param:redis_cluster_role}
+ quorum: 2
+ master:
+ host: ${_param:cluster_node01_address}
+ port: 6379
+ sentinel:
+ address: ${_param:single_address}
+ apache:
+ server:
+ modules:
+ - wsgi
+ gnocchi:
+ common:
+ database:
+ host: ${_param:openstack_database_address}
+ server:
+ identity:
+ protocol: https
+ pkgs:
+ # TODO: move python-memcache installation to formula
+ - gnocchi-api
+ - gnocchi-metricd
+ - python-memcache
+ panko:
+ server:
+ identity:
+ protocol: https
+ aodh:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ ceilometer:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ haproxy:
+ proxy:
+ listen:
+ panko_api:
+ type: ~
+ ceilometer_api:
+ type: ~
+ gnocchi_api:
+ type: ~
+ aodh-api:
+ type: ~
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 6f3cc55..56e9c28 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
@@ -29,6 +30,7 @@
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-mcp-pike-dvr.infra.backup.client_common
- cluster.virtual-mcp-pike-dvr
@@ -134,8 +136,10 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.share
- node_param:
- manila_share_address:
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
value_template: <<node_tenant_ip>>
openstack_telemetry01:
expression: <<node_hostname>>__equals__mdb01
diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index d551411..cbf24f0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -2,6 +2,7 @@
- system.linux.network.dynamic_hosts
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index 49644e2..deeb36d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -30,3 +30,12 @@
notification:
driver: messagingv2
topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 1c3f983..625e906 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -71,6 +71,9 @@
enabled: ${_param:designate_pool_manager_enabled}
periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
server:
+ enabled: ${_param:designate_server_enabled}
+ domain_id: ${_param:designate_domain_id}
+ version: ${_param:designate_version}
backend:
pdns4:
api_token: ${_param:designate_pdns_api_key}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
index 586579c..6ed3f45 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
@@ -19,3 +19,12 @@
notification:
driver: messagingv2
topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 23cebad..bcda365 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -8,6 +8,7 @@
openstack_control_node01_hostname: ctl01
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
openstack_control_node01_address: 172.16.10.101
openstack_control_node02_address: 172.16.10.102
openstack_control_node03_address: 172.16.10.103
@@ -95,6 +96,7 @@
powerdns_webserver_password: gJ6n3gVaYP8eS
powerdns_webserver_port: 8081
designate_admin_api_enabled: true
+ designate_server_enabled: true
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_mdns_address: 0.0.0.0
designate_mdns_port: 53
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
index 57625ca..04de039 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -4,9 +4,18 @@
- system.linux.storage.loopback_manila
- system.manila.share
- system.manila.share.backend.lvm
-- cluster.virtual-mcp-pike-ovs
+- cluster.virtual-mcp-pike-dvr
parameters:
_param:
manila_lvm_devices:
- /dev/loop0
loopback_device1_size: 20
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
index 3b8d738..a974a0a 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
@@ -11,7 +11,7 @@
name: ${_param:glance_storage_user}
caps:
mon: "allow r"
- osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=images"
cinder:
name: ${_param:cinder_storage_user}
caps:
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index f5c8597..006d477 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
index 965e6c2..eb618fe 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 0563d54..d1b2b88 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
@@ -28,6 +29,7 @@
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-mcp-pike-ovs.infra.backup.client_common
- cluster.virtual-mcp-pike-ovs
@@ -133,8 +135,10 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.share
- node_param:
- manila_share_address:
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
value_template: <<node_tenant_ip>>
openstack_telemetry01:
expression: <<node_hostname>>__equals__mdb01
diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index d08e08f..6d75499 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -2,6 +2,7 @@
- system.linux.network.dynamic_hosts
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 4618332..e4923a0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -46,6 +46,7 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ apache_manila_api_address: ${_param:cluster_local_address}
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 6918620..647c79f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -8,6 +8,7 @@
openstack_control_node01_hostname: ctl01
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
openstack_control_node01_address: 172.16.10.101
openstack_control_node02_address: 172.16.10.102
openstack_control_node03_address: 172.16.10.103
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
index 57625ca..449310b 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
@@ -10,3 +10,12 @@
manila_lvm_devices:
- /dev/loop0
loopback_device1_size: 20
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 0881c16..67daa26 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -6,7 +6,7 @@
- system.rabbitmq.server.vhost.openstack
- system.keystone.server.wsgi
- system.keystone.server.single
-- service.galera.master.cluster
+- service.galera.master.single
- system.galera.server.database.cinder
- system.galera.server.database.designate
- system.galera.server.database.glance
@@ -28,7 +28,7 @@
- service.neutron.gateway.single
- system.cinder.control.single
- system.cinder.control.backend.lvm
-- service.cinder.volume.single
+- service.cinder.volume.local
- system.cinder.volume.backend.lvm
- system.horizon.server.single
- system.bind.server.single
@@ -123,9 +123,14 @@
openstack_public_neutron_subnet_allocation_end: 192.168.130.254
barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
barbican_integration_enabled: False
+ openstack_message_queue_node01_address: ${_param:single_address}
+ cluster_node01_address: 127.0.1.1
+ # DEPRECATED, these are hot-fix added just to deal with wrong class loading above. This model needs maintenance.
+ cluster_node02_address: 127.0.2.1
+ cluster_node03_address: 127.0.3.1
galera:
master:
- members: ~
+ members: []
innodb_buffer_pool_size: 1024M
max_connections: 1000
slave:
@@ -141,7 +146,7 @@
neutron:
server:
message_queue:
- members: ~
+ members: []
gateway:
agent_mode: dvr_snat
dvr: True
@@ -155,7 +160,7 @@
password: ${_param:keystone_neutron_password}
tenant: service
cache:
- members: ~
+ members: []
controller:
barbican:
enabled: ${_param:barbican_integration_enabled}
@@ -166,7 +171,7 @@
enabled: ${_param:barbican_integration_enabled}
volume:
cache:
- members: ~
+ members: []
horizon:
server:
secure: False
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 580d993..d0d72ec 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -41,6 +41,7 @@
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
single_address: 172.16.10.90
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -49,6 +50,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 5cd7f19..485c5ab 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -92,6 +92,13 @@
topics: "notifications,${_param:stacklight_notification_topic}"
designate:
server:
+ enabled: ${_param:designate_server_enabled}
+ domain_id: ${_param:designate_domain_id}
+ version: ${_param:designate_version}
+ backend:
+ bind9:
+ rndc_key: ${_param:designate_bind9_rndc_key}
+ rndc_algorithm: ${_param:designate_bind9_rndc_algorithm}
pools:
default:
description: 'test pool'
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index c600e35..a29a5e6 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -32,6 +32,7 @@
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
+ designate_bind9_rndc_algorithm: hmac-sha512
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
- hostname: 'ns1.example.org.'
@@ -58,6 +59,7 @@
rndc_port: 953
rndc_key_file: /etc/designate/rndc.key
designate_version: ${_param:openstack_version}
+ designate_server_enabled: true
designate_worker_enabled: true
cluster_vip_address: ${_param:openstack_control_address}
glance_version: ${_param:openstack_version}
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 61dfbf0..40b220c 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -53,7 +53,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index f529bc6..cd82ee3 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -53,7 +53,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index e2b9819..250d608 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index f17b9bb..5f6bdf6 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -31,7 +31,7 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index 0588b70..aea660b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 0551bab..e19165e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 9797bb4..352aa0e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index e8895b3..1dc5e4c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -38,7 +38,7 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
docker_influxdb_image: influxdb:1.2
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 234544f..6594f9c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.ubuntu
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index d2210eb..ddfd347 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
classes:
- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
- system.haproxy.proxy.listen.kubernetes.apiserver
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 3b76c3f..ef53609 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -38,7 +38,7 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_grafana: grafana/grafana:5.0.3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 0211bf4..2f03c3c 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
new file mode 100644
index 0000000..22a903b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana)
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
index 3cf494d..516e5db 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/.env b/classes/cluster/virtual-mcp11-ovs-ironic/.env
new file mode 100644
index 0000000..22a903b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana)
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index be7adff..6f4fbed 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 16e21f2..d39e9d6 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index cd33c53..43b9bb9 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 808d64f..c943066 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -7,6 +7,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
@@ -51,4 +52,52 @@
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
+ remote_rsyslog_host: 127.0.0.3
+ remote_rsyslog_port: 10514
+ rsyslog:
+ client:
+ run_user: syslog
+ run_group: adm
+ enabled: true
+ rainerscript:
+ module:
+ imfile: {}
+ input:
+ imfile:
+ nginx:
+ File: "/var/log/nginx/*.log"
+ Tag: "nginx__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ apache2:
+ File: "/var/log/apache2/*.log"
+ Tag: "apache2__"
+ Severity: "notice"
+ Facility: "local0"
+ Ruleset: "myapp_logs"
+ PersistStateInterval: "0"
+ rabbitmq:
+ File: "/var/log/rabbitmq/*.log"
+ Tag: "rabbitmq__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ template:
+ ImfileFilePath:
+ parameter:
+ type: string
+ string: "<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%$.suffix%%msg:::sp-if-no-1st-sp%%msg%\n"
+ ruleset:
+ remote_logs:
+ description: 'action(type="omfwd" Target="${_param:remote_rsyslog_host}" Port="${_param:remote_rsyslog_port}" Protocol="udp" Template="ImfileFilePath")'
+ myapp_logs:
+ description: 'set $.suffix=re_extract($!metadata!filename, "(.*)/([^/]*[^/.log])", 0, 2, "all.log"); call remote_logs'
+ output:
+ remote:
+ somehost.domain:
+ action: "@${_param:remote_rsyslog_host}:${_param:remote_rsyslog_port}"
+ filter: "*.*"
+ enabled: true
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index 9f1aba9..2f132ed 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -126,6 +126,8 @@
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_ossyslog_handler_enabled: true
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index eb0da09..eae43fa 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 959ed0b..32b68e6 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -8,6 +8,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
index 25baf27..f895a17 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
index 1fd9136..02c238c 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
@@ -1,6 +1,7 @@
classes:
- system.linux.network.dynamic_hosts
- system.linux.system.single
+- system.linux.system.single.debian
- cluster.virtual-pike-ovs-dpdk.infra
- cluster.virtual-pike-ovs-dpdk.openstack
- system.openssh.server.team.lab
diff --git a/classes/system b/classes/system
index 3799d9a..ad28e21 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 3799d9a181bcb6d5d07612a5934dbfc9ed18960e
+Subproject commit ad28e212e503c42a20dd8ca7ebf2daaf22939dba
diff --git a/scripts/infra_install.sh b/scripts/infra_install.sh
index 6166440..de3b853 100755
--- a/scripts/infra_install.sh
+++ b/scripts/infra_install.sh
@@ -12,5 +12,8 @@
sleep 5
+# Run for CA generation. CA will be generated right after 'salt.minion' state.
+salt -C 'I@salt:master' state.sls salt.minion.ca
+
# Bootstrap all nodes
salt "*" state.sls linux,openssh,salt.minion,ntp,rsyslog