Merge "Fix trigger repo name for k8s per-commit test pipeline"
diff --git a/cinder/volume/backend/lvm.yml b/cinder/volume/backend/lvm.yml
index 768fb6b..6559e46 100644
--- a/cinder/volume/backend/lvm.yml
+++ b/cinder/volume/backend/lvm.yml
@@ -1,6 +1,8 @@
parameters:
_param:
- cinder_lvm_devices: [ "/dev/loop0" ]
+ cinder_lvm_default_device: "/dev/loop0"
+ cinder_lvm_devices:
+ - ${_param:cinder_lvm_default_device}
linux:
storage:
lvm:
diff --git a/haproxy/proxy/listen/opencontrail/control4_0.yml b/haproxy/proxy/listen/opencontrail/control4_0.yml
new file mode 100644
index 0000000..baeb86e
--- /dev/null
+++ b/haproxy/proxy/listen/opencontrail/control4_0.yml
@@ -0,0 +1,60 @@
+parameters:
+ _param:
+ opencontrail_stats_password: password
+ opencontrail_api_start_offset: 0
+ opencontrail_api_workers_count: 1
+ haproxy:
+ proxy:
+ listen:
+ contrail_api:
+ type: contrail-api
+ service_name: contrail
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8082
+ servers:
+ - name: ntw01
+ host: ${_param:cluster_node01_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ - name: ntw02
+ host: ${_param:cluster_node02_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ - name: ntw03
+ host: ${_param:cluster_node03_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ contrail_config_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5937
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_openstack_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5936
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_collector_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5938
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
index 976ed1a..fe0f959 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
@@ -18,6 +18,27 @@
url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
credentials: "gerrit"
script: pipelines/mcp-formula-change-test-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
param:
SOURCE_CREDENTIALS:
type: string
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index 0ea2bba..53d8260 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -87,6 +87,10 @@
type: boolean
description: "Delete Heat stack when finished (bool)"
default: 'false'
+ EXTRA_REPOS:
+ type: text
+ description: "Yaml based extra repos metadata to be added during bootstrap phase"
+ default: ''
oscore-test-cookiecutter-models:
display_name: oscore-test-cookiecutter-models
name: oscore-test-cookiecutter-models
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index c768fb4..783be95 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -20,7 +20,7 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
- credentials: "jenkins-mk"
+ credentials: "gerrit"
script: generate-cookiecutter-products.groovy
param:
# Cookiecutter
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 3ec8300..e9ba541 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -245,7 +245,7 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
- credentials: "jenkins-mk"
+ credentials: "gerrit"
script: test-cookiecutter-reclass.groovy
trigger:
gerrit:
diff --git a/keystone/client/service/contrail.yml b/keystone/client/service/contrail.yml
new file mode 100644
index 0000000..91c925e
--- /dev/null
+++ b/keystone/client/service/contrail.yml
@@ -0,0 +1,28 @@
+classes:
+- system.keystone.client.v3.service.contrail
+parameters:
+ _param:
+ cluster_public_protocol: https
+ contrail_service_protocol: http
+ keystone:
+ client:
+ server:
+ identity:
+ service:
+ opencontrail:
+ type: contrail
+ description: OpenContrail API
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_address: ${_param:cluster_public_host}
+ public_port: 8082
+ public_path: ''
+ internal_protocol: ${_param:contrail_service_protocol}
+ internal_address: ${_param:opencontrail_control_address}
+ internal_port: 8082
+ internal_path: ''
+ admin_protocol: ${_param:contrail_service_protocol}
+ admin_address: ${_param:opencontrail_control_address}
+ admin_port: 8082
+ admin_path: ''
\ No newline at end of file
diff --git a/keystone/client/v3/service/contrail.yml b/keystone/client/v3/service/contrail.yml
new file mode 100644
index 0000000..a43f222
--- /dev/null
+++ b/keystone/client/v3/service/contrail.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ contrail_service_protocol: http
+ keystone:
+ client:
+ resources:
+ v3:
+ opencontrail:
+ type: contrail
+ description: OpenContrail API
+ endpoints:
+ contrail_public:
+ interface: 'public'
+ url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8082
+ region: ${_param:openstack_region}
+ contrail_internal:
+ interface: 'internal'
+ url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+ region: ${_param:openstack_region}
+ contrail_admin:
+ interface: 'admin'
+ url: ${_param:contrail_service_protocol}://${_param:opencontrail_control_address}:8082
+ region: ${_param:openstack_region}
diff --git a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
index 9b08546..d0c9368 100644
--- a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
+++ b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
@@ -1,11 +1,42 @@
parameters:
_param:
- # pub 2048R/4C5289EF 2018-07-25
+ # pub 2048R/1FA22B08 2015-07-21
+ # pub 2048R/4C5289EF 2018-07-25 - pike +
# https://mirror.mirantis.com
linux_system_repo_mirror_mirantis_key: |-
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
+ mQENBFWt8ogBCACtT/j4WMGuhEI486Vv9zVV0GWGefHE5hBlgJSjSgrExLFqQ2Fo
+ ScaABCfvzUeuXHNoh/c2eLjx3YE6oFrdiw5tam0NFlZMM+PSufciTxQz8vrXHGx7
+ VB5rg2TXKoqOv9cW690FsRAeOtKTtBxZvYVTLEPn2GJW09Xy9CBa+n23XBHTBvKs
+ j3hxkn25Oy70Wgxk/BJqpynXGno+NzuAnIbb+f+X7i6fiXwrvtp5zOYOJeUwS+fU
+ IM/mXbetOd/sHtJqc9NUYpTip4nElEqAYRCsXDTbuMNdzSr8VlSMM8b61mBGelLH
+ XJe+EPP+Logc5KXO8adoGgWhqlbD6n7w+ynHABEBAAG0LmZ1ZWwtaW5mcmEgKEV4
+ YW1wbGUga2V5KSA8ZGV2b3BzQG1pcmFudGlzLmNvbT6JATgEEwECACIFAlWt8ogC
+ GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELzlzEYfoisIkuQIAJl0cFJ5
+ BSKMXHhRYf0BeDzhdh3pmcOXs/jSznTIxB4OE5OdwrMgKyoIkSIP8AEttvB+BuOv
+ BHmhTL7kvRhP5xiKdbCwmDtoERoaqxhRRbZJcJ+pHvl7mkEu8Gj2KZe2lfE4Z6ZF
+ 6q00Gx9HYfse1+VgUR5ymh41nZCvRTNEnYBp1RQcPogiLy2rYvZbxYnUtg4jaD7D
+ vuuEQwrfEHdKFUlWBCIVbl+e3K6ZSniOcqqyHK72/HI0SYuZpGfCzzw5deODcjWm
+ Gz4nZr41cB3eHXkfmG3ngdhmb2MpVr83u+JebOovjzusf71oIdZBTFNYsZNSVKrn
+ l0rrRuDIMHbQMuS5AQ0EVa3yiAEIALZqdLGXSGZAgUXl7zhPH5wnIQtdo6iMIovZ
+ zQNW95RDT2nm/3YddiRy6FuOTbaHXw07D4ZUl4dGVHzEwBllhULxcHV3OOdQ3gVp
+ 4mBAZ8kv0EelzqPfDQWR2Cq0hi7IJ4Q4ePpZhQFiasz8qbV7D7CYbZdDAmQKxqAk
+ 0XYOjbB3jzB2r6MHflAKmJzTp3+NAE9bDLAwXa0ot2THDbpPdB4R6pxpD6Y3jweW
+ uLUCnIfvyIBwhHobaU28pw/BA+0dkC9jnLnoO+TrzB9YD5839Lc3ctrdPBLiFPMG
+ wdfAVRCyfgLjOyULqjTudx1Mo+Dgz9+xrcTFoehI7UYoZnraEKkAEQEAAYkBHwQY
+ AQIACQUCVa3yiAIbDAAKCRC85cxGH6IrCPH5B/0Uc+OhMSCkRos1Yv5tA4bsEcjt
+ 8+sJ2S6pUqCbZxmXpzKspKpnjp3DJjmQKDB2q4UPDVElVDMMdBlstTx1RRZDf8yk
+ nDvRBSzawk7Xhfloro8N2Lxv6gWhhMvHUYItyO6KMbAZuZ2M1I1/OFHG/f//7oPM
+ 0QpNbihf+GqE/dWRz9ZDz+xlSFli6AR/3ldq7N6gkCsEFdi3j6ZDf0qLsZpazPUI
+ wiCC/aAYLkRDtTJV1G6EsWijmOTNNlCEFS/XDLQ3N2Ev/1sgAO0AlBMdXqSnqUI1
+ 1h/eSKCiGmkwFWlCf/4HnJVP7QpSeRPLyw785Fvt3p9vT+64isZ0ZK6cpcj8
+ =0aQD
+ -----END PGP PUBLIC KEY BLOCK-----
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v1
+
mQENBFtYVY8BCAC3oli93husG0ZVtv/L8I4/bcW60LFCyB0DuwEznGlSaj1fjOQu
C7QX9wvGRq8mRZ8mfZ6sbxGmgs0LnV5QIBle1l5I3B+AMGksf6UGEWgoN/vq86g+
0Jg6kJP/D0sjGXvdlfy+bgAqjsx2bWOLjQGtHSIxhe4cE9HPBfMiYsFwGQua3XN3
diff --git a/linux/system/users/cinder.yml b/linux/system/users/cinder.yml
new file mode 100644
index 0000000..0e915a3
--- /dev/null
+++ b/linux/system/users/cinder.yml
@@ -0,0 +1,18 @@
+parameters:
+ linux:
+ system:
+ user:
+ cinder:
+ enabled: true
+ name: cinder
+ home: /var/lib/cinder
+ uid: 304
+ gid: 304
+ shell: /bin/false
+ system: True
+ group:
+ cinder:
+ enabled: true
+ name: cinder
+ gid: 304
+ system: True
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 6c5744a..e0814cd 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,11 +1,6 @@
classes:
- service.neutron.client
parameters:
- _param:
- # TODO Remove below variables with typo in next release
- openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
- openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
- openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
neutron:
client:
server:
diff --git a/nova/compute/volume/nfs.yml b/nova/compute/volume/nfs.yml
new file mode 100644
index 0000000..8ff7266
--- /dev/null
+++ b/nova/compute/volume/nfs.yml
@@ -0,0 +1,13 @@
+# (ohryhorov): the class is created to be included in favour of creating
+# user cinder and add user nova to group cinder in all nova-compute nodes
+# if nfs backend is used.
+# PROD-22772
+classes:
+- system.linux.system.users.cinder
+parameters:
+ nova:
+ compute:
+ user:
+ groups:
+ - cinder
+ - libvirtd
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index acd6a0b..381a0d2 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -2,7 +2,7 @@
- service.haproxy.proxy.single
- service.keepalived.cluster.single
- service.opencontrail.control.cluster
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 782e2cb..8572553 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -2,7 +2,7 @@
- service.docker.host
- service.keepalived.cluster.single
- service.opencontrail.control.control
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
parameters:
_param:
opencontrail_version: 4.0
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 1288af4..779d8d0 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -45,17 +45,6 @@
host: ${_param:single_address}
port: 9100
params: check inter 2000 rise 2 fall 3
- contrail_discovery:
- type: contrail-api
- service_name: contrail
- binds:
- - address: ${_param:single_address}
- port: 5998
- servers:
- - name: ctl01
- host: ${_param:single_address}
- port: 9110
- params: check inter 2000 rise 2 fall 3
contrail_config_stats:
type: contrail-config
service_name: contrail
diff --git a/openscap/server/init.yml b/openscap/server/init.yml
index 0f2a76f..7964aea 100644
--- a/openscap/server/init.yml
+++ b/openscap/server/init.yml
@@ -1,2 +1,8 @@
classes:
- service.openscap.cis
+parameters:
+ _param:
+ openscap_enabled: true
+ openscap:
+ service:
+ enabled: ${_param:openscap_enabled}
diff --git a/prometheus/server/target/federation/init.yml b/prometheus/server/target/federation/init.yml
index 564af82..c480c1a 100644
--- a/prometheus/server/target/federation/init.yml
+++ b/prometheus/server/target/federation/init.yml
@@ -10,8 +10,8 @@
prometheus_federation:
honor_labels: true
metrics_path: '/federate'
- scrape_interval: 15s
- scrape_timeout: 15s
+ scrape_interval: 30s
+ scrape_timeout: 30s
endpoint:
- address: ${_param:stacklight_monitor_address}
port: 15010
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index 83f2254..e209cab 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -14,11 +14,30 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
cluster:
@@ -90,3 +109,89 @@
backend: ${_param:openstack_proxy_backend_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ mdb01:
+ name: ${_param:openstack_telemetry_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb02:
+ name: ${_param:openstack_telemetry_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb03:
+ name: ${_param:openstack_telemetry_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ bmt01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+
+
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index f09d3f6..9fd5465 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -21,11 +21,30 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
cluster:
@@ -109,3 +128,87 @@
backend: ${_param:openstack_proxy_backend_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: openstack.proxy
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ mdb01:
+ name: ${_param:openstack_telemetry_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb02:
+ name: ${_param:openstack_telemetry_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb03:
+ name: ${_param:openstack_telemetry_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ bmt01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index 2419c74..14779d2 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -17,11 +17,30 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
cluster:
@@ -93,3 +112,90 @@
backend: ${_param:openstack_proxy_backend_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.proxy
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ mdb01:
+ name: ${_param:openstack_telemetry_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb02:
+ name: ${_param:openstack_telemetry_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb03:
+ name: ${_param:openstack_telemetry_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ bmt01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+
+
+
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index 83f2254..27e2b47 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -14,11 +14,30 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
cluster:
@@ -90,3 +109,87 @@
backend: ${_param:openstack_proxy_backend_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ mdb01:
+ name: ${_param:openstack_telemetry_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb02:
+ name: ${_param:openstack_telemetry_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb03:
+ name: ${_param:openstack_telemetry_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ bmt01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index 83f2254..27e2b47 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -14,11 +14,30 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_share_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
cluster:
@@ -90,3 +109,87 @@
backend: ${_param:openstack_proxy_backend_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
+ share01:
+ name: ${_param:openstack_share_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share02:
+ name: ${_param:openstack_share_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ share03:
+ name: ${_param:openstack_share_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_share_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.share
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ mdb01:
+ name: ${_param:openstack_telemetry_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb02:
+ name: ${_param:openstack_telemetry_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ mdb03:
+ name: ${_param:openstack_telemetry_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_telemetry_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.telemetry
+ bmt01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
+ bmt03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.baremetal
diff --git a/salt/control/sizes/openstack/compact.yml b/salt/control/sizes/openstack/compact.yml
index d326a9b..4955911 100644
--- a/salt/control/sizes/openstack/compact.yml
+++ b/salt/control/sizes/openstack/compact.yml
@@ -20,6 +20,26 @@
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
salt_control_size_net_profile_openstack_upgrade: default
+ salt_control_size_cpu_openstack_share: 2
+ salt_control_size_ram_openstack_share: 2048
+ salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_net_profile_openstack_share: default
+ salt_control_size_cpu_openstack_dns: 2
+ salt_control_size_ram_openstack_dns: 4096
+ salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_net_profile_openstack_dns: default
+ salt_control_size_cpu_openstack_telemetry: 4
+ salt_control_size_ram_openstack_telemetry: 8192
+ salt_control_size_disk_profile_openstack_telemetry: xlarge
+ salt_control_size_net_profile_openstack_telemetry: default
+ salt_control_size_cpu_openstack_barbican: 4
+ salt_control_size_ram_openstack_barbican: 8192
+ salt_control_size_disk_profile_openstack_barbican: large
+ salt_control_size_net_profile_openstack_barbican: default
+ salt_control_size_cpu_openstack_baremetal: 8
+ salt_control_size_ram_openstack_baremetal: 8192
+ salt_control_size_disk_profile_openstack_baremetal: large
+ salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
size:
@@ -47,4 +67,29 @@
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ openstack.share:
+ cpu: ${_param:salt_control_size_cpu_openstack_share}
+ ram: ${_param:salt_control_size_ram_openstack_share}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ openstack.dns:
+ cpu: ${_param:salt_control_size_cpu_openstack_dns}
+ ram: ${_param:salt_control_size_ram_openstack_dns}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ openstack.telemetry:
+ cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+ ram: ${_param:salt_control_size_ram_openstack_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ openstack.barbican:
+ cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+ ram: ${_param:salt_control_size_ram_openstack_barbican}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ openstack.baremetal:
+ cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+ ram: ${_param:salt_control_size_ram_openstack_baremetal}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/large.yml b/salt/control/sizes/openstack/large.yml
index db27874..cd7d71e 100644
--- a/salt/control/sizes/openstack/large.yml
+++ b/salt/control/sizes/openstack/large.yml
@@ -20,6 +20,26 @@
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
salt_control_size_net_profile_openstack_upgrade: default
+ salt_control_size_cpu_openstack_share: 4
+ salt_control_size_ram_openstack_share: 6144
+ salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_net_profile_openstack_share: default
+ salt_control_size_cpu_openstack_dns: 4
+ salt_control_size_ram_openstack_dns: 8192
+ salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_net_profile_openstack_dns: default
+ salt_control_size_cpu_openstack_telemetry: 8
+ salt_control_size_ram_openstack_telemetry: 32768
+ salt_control_size_disk_profile_openstack_telemetry: large
+ salt_control_size_net_profile_openstack_telemetry: default
+ salt_control_size_cpu_openstack_barbican: 4
+ salt_control_size_ram_openstack_barbican: 32768
+ salt_control_size_disk_profile_openstack_barbican: large
+ salt_control_size_net_profile_openstack_barbican: default
+ salt_control_size_cpu_openstack_baremetal: 32
+ salt_control_size_ram_openstack_baremetal: 65536
+ salt_control_size_disk_profile_openstack_baremetal: large
+ salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
size:
@@ -47,4 +67,29 @@
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ openstack.share:
+ cpu: ${_param:salt_control_size_cpu_openstack_share}
+ ram: ${_param:salt_control_size_ram_openstack_share}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ openstack.dns:
+ cpu: ${_param:salt_control_size_cpu_openstack_dns}
+ ram: ${_param:salt_control_size_ram_openstack_dns}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ openstack.telemetry:
+ cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+ ram: ${_param:salt_control_size_ram_openstack_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ openstack.barbican:
+ cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+ ram: ${_param:salt_control_size_ram_openstack_barbican}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ openstack.baremetal:
+ cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+ ram: ${_param:salt_control_size_ram_openstack_baremetal}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
index e436ca6..4ff4570 100644
--- a/salt/control/sizes/openstack/medium.yml
+++ b/salt/control/sizes/openstack/medium.yml
@@ -20,6 +20,26 @@
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
salt_control_size_net_profile_openstack_upgrade: default
+ salt_control_size_cpu_openstack_share: 4
+ salt_control_size_ram_openstack_share: 4096
+ salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_net_profile_openstack_share: default
+ salt_control_size_cpu_openstack_dns: 4
+ salt_control_size_ram_openstack_dns: 6144
+ salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_net_profile_openstack_dns: default
+ salt_control_size_cpu_openstack_telemetry: 8
+ salt_control_size_ram_openstack_telemetry: 16384
+ salt_control_size_disk_profile_openstack_telemetry: large
+ salt_control_size_net_profile_openstack_telemetry: default
+ salt_control_size_cpu_openstack_barbican: 4
+ salt_control_size_ram_openstack_barbican: 16384
+ salt_control_size_disk_profile_openstack_barbican: large
+ salt_control_size_net_profile_openstack_barbican: default
+ salt_control_size_cpu_openstack_baremetal: 16
+ salt_control_size_ram_openstack_baremetal: 16384
+ salt_control_size_disk_profile_openstack_baremetal: small
+ salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
size:
@@ -47,4 +67,29 @@
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ openstack.share:
+ cpu: ${_param:salt_control_size_cpu_openstack_share}
+ ram: ${_param:salt_control_size_ram_openstack_share}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ openstack.dns:
+ cpu: ${_param:salt_control_size_cpu_openstack_dns}
+ ram: ${_param:salt_control_size_ram_openstack_dns}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ openstack.telemetry:
+ cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+ ram: ${_param:salt_control_size_ram_openstack_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ openstack.barbican:
+ cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+ ram: ${_param:salt_control_size_ram_openstack_barbican}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ openstack.baremetal:
+ cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+ ram: ${_param:salt_control_size_ram_openstack_baremetal}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/minimal.yml b/salt/control/sizes/openstack/minimal.yml
index 9e41e75..e24a597 100644
--- a/salt/control/sizes/openstack/minimal.yml
+++ b/salt/control/sizes/openstack/minimal.yml
@@ -20,6 +20,26 @@
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
salt_control_size_net_profile_openstack_upgrade: default
+ salt_control_size_cpu_openstack_share: 1
+ salt_control_size_ram_openstack_share: 2048
+ salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_net_profile_openstack_share: default
+ salt_control_size_cpu_openstack_dns: 2
+ salt_control_size_ram_openstack_dns: 4096
+ salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_net_profile_openstack_dns: default
+ salt_control_size_cpu_openstack_telemetry: 4
+ salt_control_size_ram_openstack_telemetry: 6144
+ salt_control_size_disk_profile_openstack_telemetry: small
+ salt_control_size_net_profile_openstack_telemetry: default
+ salt_control_size_cpu_openstack_barbican: 4
+ salt_control_size_ram_openstack_barbican: 6144
+ salt_control_size_disk_profile_openstack_barbican: small
+ salt_control_size_net_profile_openstack_barbican: default
+ salt_control_size_cpu_openstack_baremetal: 4
+ salt_control_size_ram_openstack_baremetal: 4096
+ salt_control_size_disk_profile_openstack_baremetal: small
+ salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
size:
@@ -47,4 +67,29 @@
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ openstack.share:
+ cpu: ${_param:salt_control_size_cpu_openstack_share}
+ ram: ${_param:salt_control_size_ram_openstack_share}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ openstack.dns:
+ cpu: ${_param:salt_control_size_cpu_openstack_dns}
+ ram: ${_param:salt_control_size_ram_openstack_dns}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ openstack.telemetry:
+ cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+ ram: ${_param:salt_control_size_ram_openstack_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ openstack.barbican:
+ cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+ ram: ${_param:salt_control_size_ram_openstack_barbican}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ openstack.baremetal:
+ cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+ ram: ${_param:salt_control_size_ram_openstack_baremetal}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/control/sizes/openstack/small.yml b/salt/control/sizes/openstack/small.yml
index 3e8aeb6..32b2113 100644
--- a/salt/control/sizes/openstack/small.yml
+++ b/salt/control/sizes/openstack/small.yml
@@ -20,6 +20,26 @@
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
salt_control_size_net_profile_openstack_upgrade: default
+ salt_control_size_cpu_openstack_share: 2
+ salt_control_size_ram_openstack_share: 2048
+ salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_net_profile_openstack_share: default
+ salt_control_size_cpu_openstack_dns: 2
+ salt_control_size_ram_openstack_dns: 4096
+ salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_net_profile_openstack_dns: default
+ salt_control_size_cpu_openstack_telemetry: 4
+ salt_control_size_ram_openstack_telemetry: 8192
+ salt_control_size_disk_profile_openstack_telemetry: large
+ salt_control_size_net_profile_openstack_telemetry: default
+ salt_control_size_cpu_openstack_barbican: 4
+ salt_control_size_ram_openstack_barbican: 8192
+ salt_control_size_disk_profile_openstack_barbican: small
+ salt_control_size_net_profile_openstack_barbican: default
+ salt_control_size_cpu_openstack_baremetal: 8
+ salt_control_size_ram_openstack_baremetal: 8192
+ salt_control_size_disk_profile_openstack_baremetal: small
+ salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
size:
@@ -47,4 +67,29 @@
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ openstack.share:
+ cpu: ${_param:salt_control_size_cpu_openstack_share}
+ ram: ${_param:salt_control_size_ram_openstack_share}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ openstack.dns:
+ cpu: ${_param:salt_control_size_cpu_openstack_dns}
+ ram: ${_param:salt_control_size_ram_openstack_dns}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ openstack.telemetry:
+ cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
+ ram: ${_param:salt_control_size_ram_openstack_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ openstack.barbican:
+ cpu: ${_param:salt_control_size_cpu_openstack_barbican}
+ ram: ${_param:salt_control_size_ram_openstack_barbican}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ openstack.baremetal:
+ cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
+ ram: ${_param:salt_control_size_ram_openstack_baremetal}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
diff --git a/salt/minion/cert/octavia/amphora_client.yml b/salt/minion/cert/octavia/amphora_client.yml
index fd8f465..5a0309f 100644
--- a/salt/minion/cert/octavia/amphora_client.yml
+++ b/salt/minion/cert/octavia/amphora_client.yml
@@ -5,7 +5,7 @@
minion:
cert:
octavia_amp_client:
- ca_file: ${octavia:manager:certificates:ca_certificate}
+ ca_file: ${octavia:manager:haproxy_amphora:server_ca}
ca_key_file: ${octavia:manager:certificates:ca_private_key}
key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
cert_file: ${octavia:manager:haproxy_amphora:client_cert}