Merge "Refresh fluentd|kibana5x|grafana repo"
diff --git a/jenkins/client/job/deploy/try_mcp.yml b/jenkins/client/job/deploy/try_mcp.yml
new file mode 100644
index 0000000..9c161ff
--- /dev/null
+++ b/jenkins/client/job/deploy/try_mcp.yml
@@ -0,0 +1,30 @@
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy_trymcp:
+ type: workflow-scm
+ name: deploy-try-mcp
+ display_name: "Deploy - TryMCP"
+ discard:
+ build:
+ keep_num: 50
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: deploy-try-mcp.groovy
+ param:
+ COOKIECUTTER_TEMPLATE_CONTEXT:
+ type: text
+ default: ""
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index dc2f412..666d9fd 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -755,6 +755,9 @@
credentials: "gerrit"
branch: 'master'
script: oscc-ci-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H 01 * * *"
param:
# general
DISTRIBUTION:
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 783be95..18483e3 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -12,9 +12,9 @@
concurrent: true
discard:
build:
- keep_num: 10
+ keep_days: 1
artifact:
- keep_num: 10
+ keep_days: 1
display_name: "Generate reclass cluster {{cookiecutter_template}}"
scm:
type: git
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index e209cab..07c918e 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -14,30 +14,6 @@
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,89 +85,3 @@
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 9fd5465..e339710 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -21,30 +21,6 @@
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:
@@ -128,87 +104,3 @@
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 14779d2..c330c97 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -17,30 +17,6 @@
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:
@@ -112,90 +88,3 @@
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 27e2b47..07c918e 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -14,30 +14,6 @@
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,87 +85,3 @@
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 27e2b47..07c918e 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -14,30 +14,6 @@
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,87 +85,3 @@
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