Merge "Add ironic-contrail model"
diff --git a/.gitignore b/.gitignore
index 2e88c07..7bfbce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
classes/service/
+.kitchen/
diff --git a/classes/cluster/ceph-ha/ceph/osd.yml b/classes/cluster/ceph-ha/ceph/osd.yml
index 44a05a4..958c05a 100644
--- a/classes/cluster/ceph-ha/ceph/osd.yml
+++ b/classes/cluster/ceph-ha/ceph/osd.yml
@@ -8,15 +8,15 @@
crush_parent: ${_param:ceph_crush_parent}
# crush_update: false
# copy_admin_key: true
- bluestore_block_db_size: 10073741824
+ bluestore_block_db_size: 900000000
backend:
bluestore:
disks:
- - dev: /dev/xvdb
- block_db: /dev/xvdd
+ - dev: /dev/vdb
+ block_db: /dev/vdd
# class: hdd
# weight: 1.5
- - dev: /dev/xvdc
- block_db: /dev/xvdd
+ - dev: /dev/vdc
+ block_db: /dev/vdd
# class: hdd
# weight: 1.5
diff --git a/classes/cluster/ceph-ha/ceph/setup.yml b/classes/cluster/ceph-ha/ceph/setup.yml
index b6ba4ad..f4a6817 100644
--- a/classes/cluster/ceph-ha/ceph/setup.yml
+++ b/classes/cluster/ceph-ha/ceph/setup.yml
@@ -5,56 +5,56 @@
setup:
pool:
images:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rbd
crush_rule: sata
volumes:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rbd
crush_rule: sata
vms:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rbd
crush_rule: sata
.rgw.root:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
default.rgw.control:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
default.rgw.meta:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
default.rgw.log:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
default.rgw.buckets.index:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
default.rgw.buckets.data:
- pg_num: 64
- pgp_num: 64
+ pg_num: 32
+ pgp_num: 32
type: replicated
application: rgw
crush_rule: sata
diff --git a/classes/cluster/os-ha-contrail-40/infra/init.yml b/classes/cluster/os-ha-contrail-40/infra/init.yml
index 182936e..eafd3c6 100644
--- a/classes/cluster/os-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/init.yml
@@ -6,4 +6,3 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
-
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index e8b854d..c3a531d 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -14,8 +14,9 @@
- system.opencontrail.client.resource.config_node
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
+- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
-- system.docker.client
+- system.docker.client.compose
- cluster.os-ha-contrail-40
parameters:
_param:
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index 30613d3..6f677d4 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -34,6 +34,8 @@
enabled: true
type: eth
proto: manual
+ pre_up_cmds:
+ - ethtool -K ens4 rx off tx off gro off tso off
vhost0:
enabled: true
type: eth
diff --git a/classes/cluster/os-ha-contrail/infra/init.yml b/classes/cluster/os-ha-contrail/infra/init.yml
index e504ccc..b54cf03 100755
--- a/classes/cluster/os-ha-contrail/infra/init.yml
+++ b/classes/cluster/os-ha-contrail/infra/init.yml
@@ -6,4 +6,3 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
-
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 4c03393..64cb921 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.opencontrail.client.resource.openstack_metadata
+- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
- cluster.os-ha-contrail
parameters:
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 8346f2f..8f15232 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -36,6 +36,8 @@
enabled: true
type: eth
proto: manual
+ pre_up_cmds:
+ - ethtool -K ens4 rx off tx off gro off tso off
vhost0:
enabled: true
type: eth
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml b/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
index d77b1d5..6f2b021 100644
--- a/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
@@ -6,8 +6,8 @@
osd:
enabled: true
crush_parent: ${_param:ceph_crush_parent}
- bluestore_block_db_size: 1007374182
- bluestore_block_wal_size: 107374182
+ bluestore_block_db_size: 900000000
+ bluestore_block_wal_size: 900000000
backend:
bluestore:
disks:
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 2aad679..b11114b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -4,5 +4,21 @@
parameters:
ceph:
common:
- public_network: 10.1.0.0/24
- cluster_network: 10.16.0.0/24
+ public_network: 10.60.0.0/24
+ cluster_network: 10.70.0.0/24
+ keyring:
+ glance:
+ name: ${_param:glance_storage_user}
+ caps:
+ mon: "allow r"
+ osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+ cinder:
+ name: ${_param:cinder_storage_user}
+ caps:
+ mon: "allow r"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rx pool=images"
+ nova:
+ name: ${_param:nova_storage_user}
+ caps:
+ mon: "allow r"
+ osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
index 7d6fcd0..65908f9 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
@@ -3,3 +3,13 @@
- system.ceph.mgr.cluster
- system.linux.system.repo.ceph
- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ 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-ocata-ovs-ceph/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
index 8aab729..3a26d46 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
@@ -3,6 +3,16 @@
- system.linux.system.repo.ceph
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+
ceph:
osd:
enabled: true
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
index 484f11c..7913537 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
@@ -9,53 +9,20 @@
pg_num: 32
pgp_num: 32
type: replicated
+ size: 2
application: rbd
crush_rule: sata
volumes:
pg_num: 32
pgp_num: 32
type: replicated
+ size: 2
application: rbd
crush_rule: sata
vms:
pg_num: 32
pgp_num: 32
type: replicated
+ size: 2
application: rbd
crush_rule: sata
- .rgw.root:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
- default.rgw.control:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
- default.rgw.meta:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
- default.rgw.log:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
- default.rgw.buckets.index:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
- default.rgw.buckets.data:
- pg_num: 32
- pgp_num: 32
- type: replicated
- application: rgw
- crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
index b289988..f57ebca 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -34,9 +34,9 @@
- system.galera.server.database.nova
- system.haproxy.proxy.listen.openstack.nova-placement
- system.glance.control.storage.ceph
-- system.cinder.control.backend.ceph
- system.ceph.common.cluster
- cluster.virtual-mcp-ocata-ovs-ceph.ceph.common
+- system.cinder.control.backend.ceph
- system.cinder.control.cluster
- system.cinder.control.notification.messagingv2
- system.cinder.volume.single
@@ -71,8 +71,6 @@
topics: "notifications,${_param:stacklight_notification_topic}"
glance:
server:
- storage:
- engine: file
images: []
workers: 1
notification:
diff --git a/classes/cluster/virtual-mcp11-contrail/.env b/classes/cluster/virtual-mcp11-contrail/.env
new file mode 100644
index 0000000..a4bacd1
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/system b/classes/system
index 1cf016f..0a17807 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 1cf016fcf3f283df4215efb7697b3a4dcfe4c9ac
+Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e