Merge "REFACTOR Added libvirt_vnc server and novnc-proxy client certificate templates"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 91ebe12..d1f6583 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -9,6 +9,7 @@
aodh:
server:
enabled: true
+ role: ${_param:openstack_node_role}
version: ${_param:aodh_version}
cluster: true
ttl: 86400
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 6eec70e..b2a55a6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -5,6 +5,7 @@
openstack_event_alarm_topic: alarm.all
aodh:
server:
+ role: ${_param:openstack_node_role}
region: ${_param:openstack_region}
event_alarm_topic: ${_param:openstack_event_alarm_topic}
identity:
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index ed45b47..d8b570c 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -6,5 +6,6 @@
cluster_internal_protocol: 'http'
barbican:
server:
+ role: ${_param:openstack_node_role}
identity:
protocol: ${_param:cluster_internal_protocol}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index aab0b18..b115e79 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -5,5 +5,6 @@
internal_protocol: 'http'
barbican:
server:
+ role: ${_param:openstack_node_role}
identity:
protocol: ${_param:internal_protocol}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index f965451..ad804f8 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -13,6 +13,7 @@
cluster: true
secret: ${_param:ceilometer_secret_key}
ttl: 86400
+ role: ${_param:openstack_node_role}
notification:
workload_partitioning: true
batch_timeout: 30
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 9758af2..ae642f1 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -3,6 +3,7 @@
parameters:
ceilometer:
server:
+ role: ${_param:openstack_node_role}
database:
influxdb:
host: ${_param:stacklight_monitor_node01_address}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 1110c63..b5d6862 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -25,6 +25,7 @@
default_volume_type: ""
backend: {}
version: ${_param:cinder_version}
+ role: ${_param:openstack_node_role}
osapi:
host: ${_param:cluster_local_address}
database:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index d442693..89c5307 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -15,6 +15,7 @@
controller:
backend: {}
default_volume_type: ''
+ role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
identity:
diff --git a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
new file mode 100644
index 0000000..7c93811
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: 'stable'
+ mirror_mirantis_com_glusterfs_3_8_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_glusterfs_3_8_xenial:
+ force: ${_param:mirror_mirantis_com_glusterfs_3_8_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/glusterfs-3.8/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/glusterfs-3.8/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_glusterfs_3_8_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='-dbg_'"
diff --git a/debmirror/mirror_mirantis_com/saltstack/salt_2016_3.yml b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
similarity index 100%
rename from debmirror/mirror_mirantis_com/saltstack/salt_2016_3.yml
rename to debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
diff --git a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
new file mode 100644
index 0000000..542afea
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ apt_mk_version: 'stable'
+ mirror_mirantis_com_saltstack_2017_7_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_saltstack_2017_7_xenial:
+ force: ${_param:mirror_mirantis_com_saltstack_2017_7_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/saltstack-2017.7/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/saltstack-2017.7/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_saltstack_2017_7_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
diff --git a/designate/server/cluster.yml b/designate/server/cluster.yml
index afbb7df..f60f883 100644
--- a/designate/server/cluster.yml
+++ b/designate/server/cluster.yml
@@ -23,6 +23,7 @@
region: ${_param:openstack_region}
domain_id: ${_param:designate_domain_id}
version: ${_param:designate_version}
+ role: ${_param:openstack_node_role}
admin_api:
enabled: ${_param:designate_admin_api_enabled}
enabled_extensions_admin: quotas
diff --git a/designate/server/single.yml b/designate/server/single.yml
index 3fdd448..683180e 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -17,6 +17,7 @@
region: ${_param:openstack_region}
domain_id: ${_param:designate_domain_id}
version: ${_param:designate_version}
+ role: ${_param:openstack_node_role}
admin_api:
enabled: ${_param:designate_admin_api_enabled}
enabled_extensions_admin: quotas
diff --git a/docker/swarm/network/keycloak_backend.yml b/docker/swarm/network/keycloak_backend.yml
new file mode 100644
index 0000000..5b1c625
--- /dev/null
+++ b/docker/swarm/network/keycloak_backend.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ docker_keycloak_network_subnet: 10.70.0.0/24
+ docker:
+ client:
+ network:
+ keycloak_backend:
+ subnet: ${_param:docker_keycloak_network_subnet}
+ driver: overlay
+ attachable: true
+
diff --git a/docker/swarm/stack/keycloak.yml b/docker/swarm/stack/keycloak.yml
new file mode 100644
index 0000000..0187a08
--- /dev/null
+++ b/docker/swarm/stack/keycloak.yml
@@ -0,0 +1,38 @@
+parameters:
+ _param:
+ docker_keycloak_server_replicas: 3
+ docker_keycloak_proxy_replicas: 1
+ docker_image_keycloak_server: jboss/keycloak:3.4.2.Final
+ docker_image_keycloak_proxy: jboss/keycloak-proxy:3.4.2.h
+ keycloak_bind_port: ${_param:haproxy_keycloak_bind_port}
+ keycloak_proxy_bind_port: ${_param:haproxy_keycloak_proxy_bind_port}
+ docker:
+ client:
+ stack:
+ keycloak:
+ service:
+ keycloak-server:
+ image: ${_param:docker_image_keycloak_server}
+ deploy:
+ replicas: ${_param:docker_keycloak_server_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_keycloak_exposed_port}:${_param:keycloak_bind_port}
+ volumes:
+ - /srv/volumes/keycloak/server/:/app
+ keycloak-proxy:
+ image: ${_param:docker_image_keycloak_proxy}
+ deploy:
+ replicas: ${_param:docker_keycloak_proxy_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_keycloak_proxy_exposed_port}:${_param:keycloak_proxy_bind_port}
+ volumes:
+ - /srv/volumes/keycloak/proxy/proxy.json:/opt/jboss/conf/proxy.json
+ network:
+ default:
+ external:
+ name: keycloak_backend
+
diff --git a/galera/server/database/tacker.yml b/galera/server/database/tacker.yml
new file mode 100644
index 0000000..9cd76b5
--- /dev/null
+++ b/galera/server/database/tacker.yml
@@ -0,0 +1,19 @@
+parameters:
+ _param:
+ mysql_tacker_ssl_option: []
+ mysql:
+ server:
+ database:
+ tacker:
+ encoding: utf8
+ users:
+ - name: tacker
+ password: ${_param:mysql_tacker_password}
+ host: '%'
+ rights: all
+ ssl_option: ${_param:mysql_tacker_ssl_option}
+ - name: tacker
+ password: ${_param:mysql_tacker_password}
+ host: ${_param:cluster_local_address}
+ rights: all
+ ssl_option: ${_param:mysql_tacker_ssl_option}
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index bb87f16..e218835 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -15,6 +15,7 @@
enabled: true
version: ${_param:glance_version}
workers: 8
+ role: ${_param:openstack_node_role}
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/glance/control/single.yml b/glance/control/single.yml
index 5580b66..63e1b48 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -9,6 +9,7 @@
version: latest
glance:
server:
+ role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
identity:
diff --git a/glusterfs/client/volume/keycloak.yml b/glusterfs/client/volume/keycloak.yml
new file mode 100644
index 0000000..06d6134
--- /dev/null
+++ b/glusterfs/client/volume/keycloak.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ keycloak_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ keycloak:
+ path: /srv/volumes/keycloak
+ server: ${_param:keycloak_glusterfs_service_host}
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ user: 1000
+ group: 1000
+
diff --git a/glusterfs/server/volume/keycloak.yml b/glusterfs/server/volume/keycloak.yml
new file mode 100644
index 0000000..c8c71f0
--- /dev/null
+++ b/glusterfs/server/volume/keycloak.yml
@@ -0,0 +1,20 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ keycloak:
+ storage: /srv/glusterfs/keycloak
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/keycloak
+ - ${_param:cluster_node02_address}:/srv/glusterfs/keycloak
+ - ${_param:cluster_node03_address}:/srv/glusterfs/keycloak
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
+
+
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index 990fda2..ede63c5 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -12,6 +12,7 @@
gnocchi:
server:
enable_proxy_headers_parsing: true
+ role: ${_param:openstack_node_role}
metricd:
metric_processing_delay: 15
metric_reporting_delay: 30
diff --git a/gnocchi/server/single.yml b/gnocchi/server/single.yml
index d82dfee..11ddf39 100644
--- a/gnocchi/server/single.yml
+++ b/gnocchi/server/single.yml
@@ -3,6 +3,7 @@
parameters:
gnocchi:
server:
+ role: ${_param:openstack_node_role}
identity:
region: ${_param:openstack_region}
metricd:
diff --git a/haproxy/proxy/listen/keycloak.yml b/haproxy/proxy/listen/keycloak.yml
new file mode 100644
index 0000000..73697a3
--- /dev/null
+++ b/haproxy/proxy/listen/keycloak.yml
@@ -0,0 +1,71 @@
+parameters:
+ _param:
+ haproxy_keycloak_bind_host: ${_param:haproxy_bind_address}
+ haproxy_keycloak_bind_port: 8086
+ haproxy_keycloak_exposed_port: 18086
+ haproxy_keycloak_ssl:
+ enabled: false
+ haproxy_keycloak_proxy_bind_host: ${_param:haproxy_bind_address}
+ haproxy_keycloak_proxy_bind_port: 8180
+ haproxy_keycloak_proxy_exposed_port: 18180
+ haproxy_keycloak_proxy_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ keycloak:
+ mode: http
+ options:
+ - forwardfor
+ - httpchk
+ - httpclose
+ - httplog
+ balance: source
+ http_request:
+ - action: "add-header X-Forwarded-Proto https"
+ condition: "if { ssl_fc }"
+ binds:
+ - address: ${_param:haproxy_keycloak_bind_host}
+ port: ${_param:haproxy_keycloak_bind_port}
+ ssl: ${_param:haproxy_keycloak_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_keycloak_exposed_port}
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_keycloak_exposed_port}
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_keycloak_exposed_port}
+ params: backup check
+ keycloak_proxy:
+ mode: http
+ options:
+ - forwardfor
+ - httpchk
+ - httpclose
+ - httplog
+ balance: source
+ http_request:
+ - action: "add-header X-Forwarded-Proto https"
+ condition: "if { ssl_fc }"
+ binds:
+ - address: ${_param:haproxy_keycloak_proxy_bind_host}
+ port: ${_param:haproxy_keycloak_proxy_bind_port}
+ ssl: ${_param:haproxy_keycloak_proxy_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_keycloak_proxy_exposed_port}
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_keycloak_proxy_exposed_port}
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_keycloak_proxy_exposed_port}
+ params: backup check
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 5829aee..eee2b63 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -22,6 +22,7 @@
enabled: true
region: ${_param:openstack_region}
version: ${_param:heat_version}
+ role: ${_param:openstack_node_role}
bind:
api_cfn:
address: ${_param:cluster_local_address}
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 0c83206..e686050 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -9,6 +9,7 @@
version: latest
heat:
server:
+ role: ${_param:openstack_node_role}
region: ${_param:openstack_region}
stack_domain_admin:
name: heat_domain_admin
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 5522f3f..b0bb69f 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -11,5 +11,6 @@
api:
enabled: true
version: ${_param:ironic_version}
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:cluster_baremetal_local_address}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index ed73e90..51c3f9c 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -9,5 +9,6 @@
version: latest
ironic:
api:
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
diff --git a/jenkins/client/job/deploy/lab/component/openstack.yml b/jenkins/client/job/deploy/lab/component/openstack.yml
index 0e526c6..2faa44a 100644
--- a/jenkins/client/job/deploy/lab/component/openstack.yml
+++ b/jenkins/client/job/deploy/lab/component/openstack.yml
@@ -18,7 +18,7 @@
stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail
- stack_test: ""
+ stack_test: "opencontrail"
job_timer: "H H(0-6) * * *"
- stack_name: os_ha_contrail_ironic
stack_env: devcloud
diff --git a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
index 8720fb1..e480d46 100644
--- a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
+++ b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
@@ -6,8 +6,8 @@
job:
test_metaswitch_vnf:
type: workflow-scm
- name: test_metaswitch_vnf
- display_name: "Onboarding tests for Metaswitch vSBC VNF"
+ name: test_metaswitch_vnf_ee
+ display_name: "Onboarding tests for Metaswitch vSBC VNF against CFY Enterprise Edition"
discard:
build:
keep_num: 20
@@ -50,7 +50,7 @@
default: "${_param:vnf_openstack_api_credentials}"
OPENSTACK_API_TENANT:
type: string
- default: "test"
+ default: "test-metaswitch"
GERRIT_CREDENTIALS:
type: string
default: "${_param:vnf_gerrit_credentials}"
@@ -79,11 +79,11 @@
default: "${_param:contrail_api_url}"
SETUP_OWN_CLOUDIFY:
type: boolean
- description: "Use temporary private Cloudify instance"
- default: false
+ description: "Use temporary private Cloudify instance. Metaswitch vSBC can work only with its own CFY instance"
+ default: true
CLOUDIFY_MANAGER_IP:
type: string
- description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
+ description: "IP address of external Cloudify. \"auto\" refers to address of deploy_cloudify_enterprise job Cloudify instance"
default: "auto"
CLOUDIFY_MANAGER_OPTIONS:
type: string
@@ -97,6 +97,13 @@
type: string
description: "Parameters for cloudify agent VMs."
default: "CFY_AGENT_NET=cfm-net-shared CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_BACKEND_FLAVOR=backend.metaswitch CFY_AGENT_IMAGE=agent_vm CFY_AGENT_BASE_IMAGE=base_agent_vm CFY_AGENT_BACKEND_IMAGE=base_backend_vm"
+ CLOUDIFY_MANAGER_VERSION:
+ type: choice
+ choices:
+ - enterprise
+ - community
+ default: "enterprise"
+ description: "CFY edition version, make sure that it is consistent with CFY Manager image"
VNF_ARTIFACTORY_URL:
type: string
default: "${_param:vnf_artifactory_url}"
@@ -116,14 +123,14 @@
VNF_PLUGINS:
type: string
description: "Plugins to fetch from artifactory and install during build package step"
- default: "vnf_onboarding_tools-0.1-py27-none-linux_x86_64_Ubuntu_xenial"
+ default: "vnf_onboarding_tools-0.2-py27-none-linux_x86_64_CentOS_Core, cloudify_diamond_plugin-1.3.8-py27-none-linux_x86_64-centos-Core, metaswitch_deployment_plugin-2.1.0-py27-none-linux_x86_64-centos-Core"
VNF_OPTIONS:
type: string
- default: ""
+ default: "METASWITCH_VSBS_BPS=mirantis-blueprint-insecure-withoutsas-newlicense.tar DCM_IMAGE_NAME=MSwVA-DCM-V3.3 MDM_IMAGE_NAME=MSwVA-MDM-centos PERIMETA_IMAGE_NAME=MSwVA-Perimeta-V4.3.50_SU42_P252"
VNF_DOCKER_CLI_PLATFORM:
type: string
default: "ubuntu"
- CLOUDIFY_DEPLOYMENT_TIMEOUT:
+ VNF_DEPLOYMENT_TIMEOUT:
type: string
description: "Set up timeout for cloudify deployment (depends on each VNF specific and network throughput)."
default: 7200
diff --git a/keycloak/proxy/application/devops_portal.yml b/keycloak/proxy/application/devops_portal.yml
new file mode 100644
index 0000000..bf09f69
--- /dev/null
+++ b/keycloak/proxy/application/devops_portal.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ keycloak_proxy_devops_portal_base_path: "/"
+ keycloak:
+ proxy:
+ applications:
+ devops_portal:
+ base_path: "${_param:keycloak_proxy_devops_portal_base_path}"
+ adapter_config:
+ realm: "jaeger"
+ auth_server_url: "http://keycloak/auth"
+ resource: "proxy-jaeger"
+
diff --git a/keystone/client/service/tacker.yml b/keystone/client/service/tacker.yml
new file mode 100644
index 0000000..335bc6e
--- /dev/null
+++ b/keystone/client/service/tacker.yml
@@ -0,0 +1,34 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ tacker_service_protocol: http
+ tacker_public_host: ${_param:cluster_public_host}
+ keystone:
+ client:
+ server:
+ identity:
+ project:
+ service:
+ user:
+ tacker:
+ is_admin: true
+ password: ${_param:keystone_tacker_password}
+ email: ${_param:admin_email}
+ service:
+ tacker:
+ type: nfv-orchestration
+ description: OpenStack Tacker NFV Orchestrator Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:tacker_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 9890
+ public_path: '/'
+ internal_address: ${_param:tacker_service_host}
+ internal_port: 9890
+ internal_path: '/'
+ internal_protocol: ${_param:tacker_service_protocol}
+ admin_protocol: ${_param:tacker_service_protocol}
+ admin_address: ${_param:tacker_service_host}
+ admin_port: 9890
+ admin_path: '/'
diff --git a/keystone/client/v3/service/tacker.yml b/keystone/client/v3/service/tacker.yml
new file mode 100644
index 0000000..c5187dd
--- /dev/null
+++ b/keystone/client/v3/service/tacker.yml
@@ -0,0 +1,34 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ tacker_service_protocol: http
+ tacker_public_host: ${_param:cluster_public_host}
+ keystone:
+ client:
+ resources:
+ v3:
+ users:
+ tacker:
+ password: ${_param:keystone_tacker_password}
+ email: ${_param:admin_email}
+ roles:
+ service_admin:
+ name: admin
+ project_id: service
+ service:
+ tacker:
+ type: nfv-orchestration
+ description: OpenStack Tacker NFV Orchestrator Service
+ endpoints:
+ tacker_public:
+ interface: 'public'
+ url: ${_param:cluster_public_protocol}://${_param:tacker_public_host}:9890/
+ region: ${_param:openstack_region}
+ tacker_internal:
+ interface: 'internal'
+ url: ${_param:tacker_service_protocol}://${_param:tacker_service_host}:9890/
+ region: ${_param:openstack_region}
+ tacker_admin:
+ interface: 'admin'
+ url: ${_param:tacker_service_protocol}://${_param:tacker_service_host}:9890/
+ region: ${_param:openstack_region}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 0ae502b..7e6980b 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -6,6 +6,7 @@
parameters:
_param:
keystone_tokens_expiration: 3600
+ openstack_node_role: primary
linux:
system:
package:
@@ -25,6 +26,7 @@
admin_name: admin
admin_password: ${_param:keystone_admin_password}
admin_email: ${_param:admin_email}
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:cluster_local_address}
private_address: ${_param:cluster_vip_address}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 16c26ca..2b1e89e 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -8,6 +8,7 @@
mysql_admin_password: password
mysql_keystone_password: password
keystone_tokens_expiration: 3600
+ openstack_node_role: primary
linux:
system:
package:
@@ -24,6 +25,7 @@
admin_name: admin
admin_password: ${_param:keystone_admin_password}
admin_email: ${_param:admin_email}
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
private_address: ${_param:single_address}
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index 0680c06..ddf6973 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -26,7 +26,7 @@
kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4
kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
- kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.1.1
+ kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.1.2
kubernetes_criproxy_version: v0.11.1
kubernetes_criproxy_checksum: md5=a3f1f08bdc7a8d6eb73b7c8fa5bae200
kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
index f9c8c50..c2e6db5 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
@@ -1,3 +1,5 @@
+# DEPRECATED since 2018.7+ release.
+# Please use system/repo/mcp/apt_mirantis
parameters:
_param:
apt_mk_version: stable
diff --git a/manila/control/cluster.yml b/manila/control/cluster.yml
index ff6ca10..7ea128b 100644
--- a/manila/control/cluster.yml
+++ b/manila/control/cluster.yml
@@ -10,6 +10,7 @@
api:
enabled: true
version: ${_param:openstack_version}
+ role: ${_param:openstack_node_role}
scheduler:
enabled: true
version: ${_param:openstack_version}
diff --git a/manila/control/single.yml b/manila/control/single.yml
index 3e14e96..262a158 100644
--- a/manila/control/single.yml
+++ b/manila/control/single.yml
@@ -9,6 +9,7 @@
api:
enabled: true
version: ${_param:openstack_version}
+ role: ${_param:openstack_node_role}
scheduler:
enabled: true
version: ${_param:openstack_version}
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index d698e7c..6c45f6d 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -8,6 +8,7 @@
server:
enabled: true
version: ${_param:murano_version}
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
port: 8082
diff --git a/murano/server/single.yml b/murano/server/single.yml
index c3da9f8..938263d 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -6,6 +6,7 @@
server:
enabled: true
version: ${_param:murano_version}
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
port: 8082
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 166de3a..703f196 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -37,6 +37,7 @@
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
neutron:
server:
+ role: ${_param:openstack_node_role}
plugin: contrail
identity:
protocol: ${_param:cluster_internal_protocol}
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 067b4df..6196c0a 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -12,6 +12,7 @@
version: latest
neutron:
server:
+ role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
identity:
diff --git a/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml b/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml
index 636fc73..831811f 100644
--- a/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml
+++ b/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml
@@ -20,7 +20,7 @@
vcpus: 1
MetaswitchSSC:
ram: 4096
- disk: 40
+ disk: 80
vcpus: 2
backend.metaswitch:
ram: 2048
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index be5f775..90a2bae 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -30,6 +30,7 @@
ram_allocation_ratio: ${_param:nova_ram_allocation_ratio}
disk_allocation_ratio: ${_param:nova_disk_allocation_ratio}
workers: 8
+ role: ${_param:openstack_node_role}
bind:
private_address: ${_param:cluster_local_address}
public_address: ${_param:cluster_vip_address}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 07a3b01..4e3799b 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -11,6 +11,7 @@
version: latest
nova:
controller:
+ role: ${_param:openstack_node_role}
database:
host: ${_param:single_address}
identity:
diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index 958f3d4..9e5d0c9 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -7,6 +7,7 @@
octavia:
api:
enabled: true
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:cluster_local_address}
database:
diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index a9d30a5..ff76e76 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -6,6 +6,7 @@
octavia:
api:
enabled: true
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
database:
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 68f8007..8c16c70 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -1,3 +1,5 @@
+classes:
+ - service.opencontrail.compute.cluster
applications:
- opencontrail
parameters:
diff --git a/openssh/client/root.yml b/openssh/client/root.yml
index 145f5da..66f8f88 100644
--- a/openssh/client/root.yml
+++ b/openssh/client/root.yml
@@ -36,7 +36,9 @@
user:
root:
enabled: true
- private_key:
- type: rsa
- key: ${_param:root_private_key}
user: ${linux:system:user:root}
+ private_key: ${private_keys:root}
+ private_keys:
+ root:
+ type: rsa
+ key: ${_param:root_private_key}
diff --git a/openssh/server/team/members/ivasilevskaya.yml b/openssh/server/team/members/ivasilevskaya.yml
new file mode 100644
index 0000000..bc50441
--- /dev/null
+++ b/openssh/server/team/members/ivasilevskaya.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ ivasilevskaya:
+ enabled: true
+ name: ivasilevskaya
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Inessa Vasilevskaya
+ home: /home/ivasilevskaya
+ email: ivasilevskaya@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ ivasilevskaya:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJk2ip+Rn73D4vt47pe/Hv42ylKJv6JIzeF0k3OflH+RyliVelvo05KMcozfsmmvOKhwgDokBj3KjQ10ewDwD7Fz5H3tosa8JFOs36cuHx9aHrsEmj1oIcIyThrIBwSZGFApqJqj27sLtReVLQJPlYR59RJGw61TogkA/QooOABi+KHzuwPFjAcA1SMfFT8LwiaNPkyUdRb5EQeKCOHniRAEPGNIwskA0sxz25qbB1EU2XBFjkxRE1b5GHfUYL+c2YhAwRWTJbD2JbbcHI6HpsmJutzkS6YIkEn1CK4JuA40OQTYFSEutCk2uPPR0G+77Fec2+vD/8H+ncPxPeDqNR ina@ina-ThinkPad-X240
+ user: ${linux:system:user:ivasilevskaya}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 7e5f915..e4f5ea7 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -3,6 +3,9 @@
- system.openssh.server.team.members.pjediny
- system.openssh.server.team.members.skreys
- system.openssh.server.team.members.smatov
+- system.openssh.server.team.members.ivasilevskaya
+- system.openssh.server.team.members.jcach
+- system.openssh.server.team.members.psvimbersky
parameters:
_param:
linux_system_user_sudo: true
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index c258c9a..e277c30 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -11,6 +11,7 @@
panko_memcached_node03_address: ${_param:cluster_node03_address}
panko:
server:
+ role: ${_param:openstack_node_role}
identity:
host: ${_param:openstack_control_address}
database:
diff --git a/reclass/storage/system/openstack_baremetal_cluster.yml b/reclass/storage/system/openstack_baremetal_cluster.yml
index 71f6034..ff6592f 100644
--- a/reclass/storage/system/openstack_baremetal_cluster.yml
+++ b/reclass/storage/system/openstack_baremetal_cluster.yml
@@ -21,6 +21,7 @@
single_address: ${_param:openstack_baremetal_node01_address}
keepalived_vip_priority: 101
baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_node_role: primary
openstack_baremetal_node02:
name: ${_param:openstack_baremetal_node02_hostname}
domain: ${_param:cluster_domain}
@@ -32,6 +33,7 @@
single_address: ${_param:openstack_baremetal_node02_address}
keepalived_vip_priority: 102
baremetal_address: ${_param:openstack_baremetal_node02_baremetal_address}
+ openstack_node_role: secondary
openstack_baremetal_node03:
name: ${_param:openstack_baremetal_node03_hostname}
domain: ${_param:cluster_domain}
@@ -43,5 +45,6 @@
single_address: ${_param:openstack_baremetal_node03_address}
keepalived_vip_priority: 103
baremetal_address: ${_param:openstack_baremetal_node03_baremetal_address}
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_baremetal_single.yml b/reclass/storage/system/openstack_baremetal_single.yml
index 3b279b0..36e89d3 100644
--- a/reclass/storage/system/openstack_baremetal_single.yml
+++ b/reclass/storage/system/openstack_baremetal_single.yml
@@ -14,3 +14,4 @@
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_baremetal_node01_address}
baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
index 300a04c..e05b3e9 100644
--- a/reclass/storage/system/openstack_control_cluster.yml
+++ b/reclass/storage/system/openstack_control_cluster.yml
@@ -19,6 +19,7 @@
keepalived_vip_priority: 103
opencontrail_database_id: 1
rabbitmq_cluster_role: master
+ openstack_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -31,6 +32,7 @@
keepalived_vip_priority: 102
opencontrail_database_id: 2
rabbitmq_cluster_role: slave
+ openstack_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -43,3 +45,4 @@
keepalived_vip_priority: 101
opencontrail_database_id: 3
rabbitmq_cluster_role: slave
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_large.yml b/reclass/storage/system/openstack_control_large.yml
index 842e133..4ad2e90 100644
--- a/reclass/storage/system/openstack_control_large.yml
+++ b/reclass/storage/system/openstack_control_large.yml
@@ -19,6 +19,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
keepalived_vip_priority: 105
+ openstack_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,6 +30,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node02_address}
keepalived_vip_priority: 104
+ openstack_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -39,6 +41,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node03_address}
keepalived_vip_priority: 103
+ openstack_node_role: secondary
openstack_control_node04:
name: ${_param:openstack_control_node04_hostname}
domain: ${_param:cluster_domain}
@@ -49,6 +52,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node04_address}
keepalived_vip_priority: 102
+ openstack_node_role: secondary
openstack_control_node05:
name: ${_param:openstack_control_node05_hostname}
domain: ${_param:cluster_domain}
@@ -59,3 +63,4 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node05_address}
keepalived_vip_priority: 101
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_single.yml b/reclass/storage/system/openstack_control_single.yml
index e7329da..fe5c870 100644
--- a/reclass/storage/system/openstack_control_single.yml
+++ b/reclass/storage/system/openstack_control_single.yml
@@ -14,3 +14,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_control_upgrade_single.yml b/reclass/storage/system/openstack_control_upgrade_single.yml
index e387062..b00cc81 100644
--- a/reclass/storage/system/openstack_control_upgrade_single.yml
+++ b/reclass/storage/system/openstack_control_upgrade_single.yml
@@ -14,3 +14,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:openstack_upgrade_system_codename}
single_address: ${_param:openstack_upgrade_node01_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index 9dc6457..c33a8db 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -17,6 +17,7 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node01_address}
keepalived_vip_priority: 103
+ openstack_node_role: primary
openstack_telemetry_node02:
name: ${_param:openstack_telemetry_node02_hostname}
domain: ${_param:cluster_domain}
@@ -27,6 +28,7 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node02_address}
keepalived_vip_priority: 102
+ openstack_node_role: secondary
openstack_telemetry_node03:
name: ${_param:openstack_telemetry_node03_hostname}
domain: ${_param:cluster_domain}
@@ -37,3 +39,4 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node03_address}
keepalived_vip_priority: 101
+ openstack_node_role: secondary
diff --git a/sahara/server/cluster.yml b/sahara/server/cluster.yml
index cdb7b04..b01ab3d 100644
--- a/sahara/server/cluster.yml
+++ b/sahara/server/cluster.yml
@@ -9,6 +9,7 @@
enabled: true
version: ${_param:sahara_version}
notification: false
+ role: ${_param:openstack_node_role}
bind:
address: ${_param:single_address}
port: 8386
diff --git a/sahara/server/single.yml b/sahara/server/single.yml
index 01e7b38..fcb26c9 100644
--- a/sahara/server/single.yml
+++ b/sahara/server/single.yml
@@ -5,6 +5,7 @@
server:
enabled: true
version: ${_param:sahara_version}
+ role: ${_param:openstack_node_role}
bind:
host: ${_param:single_address}
port: 8386
diff --git a/salt/control/placement/cicd/compact.yml b/salt/control/placement/cicd/compact.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/compact.yml
+++ b/salt/control/placement/cicd/compact.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/large.yml b/salt/control/placement/cicd/large.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/large.yml
+++ b/salt/control/placement/cicd/large.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/medium.yml b/salt/control/placement/cicd/medium.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/medium.yml
+++ b/salt/control/placement/cicd/medium.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/minimal.yml b/salt/control/placement/cicd/minimal.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/minimal.yml
+++ b/salt/control/placement/cicd/minimal.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/small.yml b/salt/control/placement/cicd/small.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/small.yml
+++ b/salt/control/placement/cicd/small.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/compact.yml b/salt/control/placement/opencontrail/compact.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/compact.yml
+++ b/salt/control/placement/opencontrail/compact.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/large.yml b/salt/control/placement/opencontrail/large.yml
index e3d9c8d..1aabd0d 100644
--- a/salt/control/placement/opencontrail/large.yml
+++ b/salt/control/placement/opencontrail/large.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/medium.yml b/salt/control/placement/opencontrail/medium.yml
index ff2952d..dfc32f3 100644
--- a/salt/control/placement/opencontrail/medium.yml
+++ b/salt/control/placement/opencontrail/medium.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/minimal.yml b/salt/control/placement/opencontrail/minimal.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/minimal.yml
+++ b/salt/control/placement/opencontrail/minimal.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/small.yml b/salt/control/placement/opencontrail/small.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/small.yml
+++ b/salt/control/placement/opencontrail/small.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index 650d4d9..cb056dd 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -26,55 +26,68 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node04_hostname}:
+ ctl04:
+ name: ${_param:openstack_control_node04_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node05_hostname}:
+ ctl05:
+ name: ${_param:openstack_control_node05_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index de9c010..7d0e166 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -22,47 +22,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/stacklight/compact.yml b/salt/control/placement/stacklight/compact.yml
index a84443d..2cde570 100644
--- a/salt/control/placement/stacklight/compact.yml
+++ b/salt/control/placement/stacklight/compact.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/large.yml b/salt/control/placement/stacklight/large.yml
index 46c2890..7b380d8 100644
--- a/salt/control/placement/stacklight/large.yml
+++ b/salt/control/placement/stacklight/large.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/medium.yml b/salt/control/placement/stacklight/medium.yml
index 117b2f5..7f54f4d 100644
--- a/salt/control/placement/stacklight/medium.yml
+++ b/salt/control/placement/stacklight/medium.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ lop02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/minimal.yml b/salt/control/placement/stacklight/minimal.yml
index a84443d..2cde570 100644
--- a/salt/control/placement/stacklight/minimal.yml
+++ b/salt/control/placement/stacklight/minimal.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/small.yml b/salt/control/placement/stacklight/small.yml
index 2e039ff..e16a7cb 100644
--- a/salt/control/placement/stacklight/small.yml
+++ b/salt/control/placement/stacklight/small.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file