Merge pull request #125 from Mirantis/nova_allocation_ratios
parametrs for allocation ratio
diff --git a/freeipa/server/cluster.yml b/freeipa/server/cluster.yml
index 70f13b9..4bcbeb6 100644
--- a/freeipa/server/cluster.yml
+++ b/freeipa/server/cluster.yml
@@ -5,6 +5,7 @@
server:
realm: ${_param:freeipa_realm}
domain: ${_param:cluster_domain}
+ princimal_user: ${_param:freeipa_principal_user}
servers:
- ${_param:infra_freeipa_node01_hostname}.${_param:cluster_domain}
- ${_param:infra_freeipa_node02_hostname}.${_param:cluster_domain}
@@ -13,8 +14,5 @@
password: ${_param:freeipa_admin_password}
ldap:
password: ${_param:freeipa_ldap_password}
- dns:
- zone:
- # Main zones
- mb-staging.vw.vwg: ${_param:freeipa_dns_zone}
+
diff --git a/haproxy/proxy/listen/stacklight/redis.yml b/haproxy/proxy/listen/stacklight/redis.yml
index bd36cb4..881e8ed 100644
--- a/haproxy/proxy/listen/stacklight/redis.yml
+++ b/haproxy/proxy/listen/stacklight/redis.yml
@@ -4,7 +4,8 @@
listen:
redis:
mode: tcp
- check:
+ check: False
+ health-check:
tcp:
options:
- send PING\r\n
diff --git a/linux/system/repo/mcp10.yml b/linux/system/repo/mcp10.yml
new file mode 100644
index 0000000..2f1e55c
--- /dev/null
+++ b/linux/system/repo/mcp10.yml
@@ -0,0 +1,24 @@
+parameters:
+ linux:
+ system:
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0 mitaka main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/archive-mcp1.0.key"
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0 mitaka-hotfix main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/archive-mcp1.0.key"
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0 mitaka-security main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/archive-mcp1.0.key"
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0 mitaka-updates main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/archive-mcp1.0.key"
+ mirantis_openstack_holdback:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0 mitaka-holdback main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/archive-mcp1.0.key"
diff --git a/linux/system/repo/mcp_contrail.yml b/linux/system/repo/mcp_contrail.yml
new file mode 100644
index 0000000..85f0aa4
--- /dev/null
+++ b/linux/system/repo/mcp_contrail.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ linux_repo_contrail_component: oc311
+ linux:
+ system:
+ repo:
+ tcpcloud_opencontrail:
+ source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ nightly ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+
+
+
diff --git a/linux/system/repo/mos9_galera.yml b/linux/system/repo/mos9_galera.yml
new file mode 100644
index 0000000..5c7430b
--- /dev/null
+++ b/linux/system/repo/mos9_galera.yml
@@ -0,0 +1,30 @@
+parameters:
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ repo:
+ mirantis_9_0_mos_main_repo:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ pin:
+ # Galera packages should be picked from mos9.0-main
+ - pin: "release a=mos9.0"
+ priority: 800
+ package: "/mysql-server-wsrep-5.6/"
+ - pin: "release a=mos9.0"
+ priority: 800
+ package: "/mysql-client-5.6/"
+ - pin: "release a=mos9.0"
+ priority: 800
+ package: "/mysql-server-wsrep-core-5.6/"
+ - pin: "release a=mos9.0"
+ priority: 800
+ package: "/mysql-client-core-5.6/"
+ # Set lowest priority for remain packages from this repo
+ # as we want use only galera from here
+ - pin: "release a=mos9.0"
+ priority: 400
+ package: "*"
diff --git a/linux/system/single.yml b/linux/system/single.yml
index 44bfbfd..24f7048 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -29,6 +29,8 @@
net.ipv4.neigh.default.gc_thresh3: 16384
net.core.netdev_max_backlog: 261144
kernel.panic: 60
+ cpu:
+ governor: performance
timezone: UTC
locale:
en_US.UTF-8:
diff --git a/reclass/storage/system/infra_idm_cluster.yml b/reclass/storage/system/infra_idm_cluster.yml
new file mode 100644
index 0000000..aae2370
--- /dev/null
+++ b/reclass/storage/system/infra_idm_cluster.yml
@@ -0,0 +1,35 @@
+parameters:
+ _param:
+ infra_idm_node01_hostname: idm01
+ infra_idm_node02_hostname: idm02
+ infra_idm_node03_hostname: idm03
+ reclass:
+ storage:
+ node:
+ infra_idm_node01:
+ name: ${_param:infra_idm_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.idm
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: centos
+ single_address: ${_param:infra_idm_node01_address}
+ infra_idm_node02:
+ name: ${_param:infra_idm_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.idm
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: centos
+ single_address: ${_param:infra_idm_node02_address}
+ infra_idm_node03:
+ name: ${_param:infra_idm_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.idm
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: centos
+ single_address: ${_param:infra_idm_node03_address}
\ No newline at end of file
diff --git a/salt/control/cluster/infra_idm_cluster.yml b/salt/control/cluster/infra_idm_cluster.yml
new file mode 100644
index 0000000..98d580b
--- /dev/null
+++ b/salt/control/cluster/infra_idm_cluster.yml
@@ -0,0 +1,26 @@
+parameters:
+ salt:
+ control:
+ size:
+ infra.idm:
+ cpu: 4
+ ram: 8192
+ disk_profile: large
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ idm01:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_centos7_image}
+ size: infra.idm
+ idm02:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_centos7_image}
+ size: infra.idm
+ idm03:
+ provider: kvm03.${_param:cluster_domain}
+ image: ${_param:salt_control_centos7_image}
+ size: infra.idm
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 78b7d91..851372a 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -8,6 +8,10 @@
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git'
revision: ${_param:salt_master_environment_revision}
+ avinetworks:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git'
+ revision: ${_param:salt_master_environment_revision}
billometer:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 6d9bcab..439bbd8 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -7,6 +7,9 @@
aodh:
source: pkg
name: salt-formula-aodh
+ avinetworks:
+ source: pkg
+ name: salt-formula-avinetworks
billometer:
source: pkg
name: salt-formula-billometer