Merge "Fix elasticsearch curator, added second action for events"
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
index 553e6dd..35ae854 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
@@ -41,18 +41,6 @@
component: oc32
distributions:
- ubuntu-trusty/${_param:apt_mk_version}
- mcp_opencontrail_trusty_oc303:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc303
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc303
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
mirantis_openstack_trusty_extra:
source: http://apt-mk.mirantis.com/trusty/
distribution: ${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
index 6272b69..a340a46 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
@@ -41,18 +41,6 @@
component: oc32
distributions:
- ubuntu-xenial/${_param:apt_mk_version}
- mcp_opencontrail_xenial_oc303:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc303
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc303
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
mirantis_openstack_xenial_extra:
source: http://apt-mk.mirantis.com/xenial/
distribution: ${_param:apt_mk_version}
diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
index 083388c..1a2cd51 100644
--- a/docker/swarm/stack/elasticsearch.yml
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -1,11 +1,19 @@
parameters:
_param:
elasticsearch_replicas: 1
- docker_image_oss_elasticsearch: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/elasticsearch:latest
+ docker_image_elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+ elasticsearch_cluster_name: oss-cluster
+ elasticsearch_xpack_security_enabled: 'false'
+ elasticsearch_discovery_zen_minimum_master_nodes: 1
docker:
client:
stack:
elasticsearch:
+ environment:
+ cluster.name: ${_param:elasticsearch_cluster_name}
+ xpack.security.enabled: ${_param:elasticsearch_xpack_security_enabled}
+ discovery.zen.minimum_master_nodes: ${_param:elasticsearch_discovery_zen_minimum_master_nodes}
+ ES_JAVA_OPTS: '-Des.enforce.bootstrap.checks=true'
service:
cluster:
image: ${_param:docker_image_oss_elasticsearch}
@@ -16,4 +24,4 @@
ports:
- ${_param:haproxy_elasticsearch_exposed_port}:${_param:haproxy_elasticsearch_bind_port}
volumes:
- - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
+ - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
\ No newline at end of file
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index b009e9e..6402721 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -42,4 +42,5 @@
- host: ${_param:openstack_message_queue_node03_address}
storage:
engine: file
- images: []
\ No newline at end of file
+ images: []
+ show_multiple_locations: True
diff --git a/glance/control/single.yml b/glance/control/single.yml
index 13f4434..458cd37 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -5,3 +5,4 @@
server:
database:
host: ${_param:single_address}
+ show_multiple_locations: True
diff --git a/glusterfs/client/volume/keystone.yml b/glusterfs/client/volume/keystone.yml
index 7139029..822b61f 100644
--- a/glusterfs/client/volume/keystone.yml
+++ b/glusterfs/client/volume/keystone.yml
@@ -13,3 +13,9 @@
user: keystone
group: keystone
opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ keystone-credential-keys:
+ path: /var/lib/keystone/credential-keys
+ server: ${_param:keystone_glusterfs_service_host}
+ user: keystone
+ group: keystone
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/keystone.yml b/glusterfs/server/volume/keystone.yml
index 229d787..2515fca 100644
--- a/glusterfs/server/volume/keystone.yml
+++ b/glusterfs/server/volume/keystone.yml
@@ -14,4 +14,17 @@
nfs.disable: On
network.remote-dio: On
diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
\ No newline at end of file
+ diagnostics.brick-log-level: WARNING
+ keystone-credential-keys:
+ storage: /srv/glusterfs/keystone-credential-keys
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/keystone-credential-keys
+ - ${_param:cluster_node02_address}:/srv/glusterfs/keystone-credential-keys
+ - ${_param:cluster_node03_address}:/srv/glusterfs/keystone-credential-keys
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index ef0241d..b37c48f 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -13,7 +13,7 @@
master:
host: ${_param:jenkins_master_host}
port: ${_param:jenkins_master_port}
- user: ${_param:jenkins_client_user}
+ username: ${_param:jenkins_client_user}
password: ${_param:jenkins_client_password}
plugin:
ansicolor: {}
diff --git a/jenkins/client/job/deploy/update/upgrade_compute.yml b/jenkins/client/job/deploy/update/upgrade_compute.yml
index 0d7ea78..6fc6ef1 100644
--- a/jenkins/client/job/deploy/update/upgrade_compute.yml
+++ b/jenkins/client/job/deploy/update/upgrade_compute.yml
@@ -7,7 +7,7 @@
jenkins:
client:
job:
- deploy-update-package:
+ deploy-upgrade-compute:
type: workflow-scm
concurrent: true
display_name: "Deploy - upgrade computes"
@@ -27,9 +27,6 @@
type: string
default: "*"
description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
- TARGET_PACKAGES:
- type: string
- description: Space delimited list of packages to be updates [package1=version package2=version], empty string means all updating all packages to the latest version.
TARGET_SUBSET_TEST:
type: string
description: Number of nodes to list package updates, empty string means all targetted nodes.
@@ -37,6 +34,3 @@
type: string
default: '1'
description: Number of selected nodes to live apply selected package update.
- TARGET_BATCH_LIVE:
- type: string
- description: Batch size for the complete live package update on all nodes, empty string means apply to all targetted nodes.
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index e9e7447..084835c 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -7,6 +7,7 @@
jobs:
- name: aptly
- name: ci
+ - name: prometheus
template:
discard:
build:
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index f077faf..a8f7069 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -31,6 +31,8 @@
expiration: 3600
max_active_keys: 3
location: /var/lib/keystone/fernet-keys
+ credential:
+ location: /var/lib/keystone/credential-keys
message_queue:
engine: rabbitmq
members:
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index aae179f..72dc045 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -35,6 +35,8 @@
expiration: 3600
max_active_keys: 3
location: /var/lib/keystone/fernet-keys
+ credential:
+ location: /var/lib/keystone/credential-keys
message_queue:
engine: rabbitmq
host: ${_param:single_address}
diff --git a/opencontrail/client/resource/openstack_metadata.yml b/opencontrail/client/resource/openstack_metadata.yml
new file mode 100644
index 0000000..3ed8f3b
--- /dev/null
+++ b/opencontrail/client/resource/openstack_metadata.yml
@@ -0,0 +1,9 @@
+parameters:
+ opencontrail:
+ client:
+ linklocal_service:
+ metadata:
+ lls_ip: 169.254.169.254
+ lls_port: 80
+ ipf_addresses: ${_param:openstack_control_address}
+ ipf_port: 8775
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
new file mode 100644
index 0000000..b21eb52
--- /dev/null
+++ b/opencontrail/compute/cluster4_0.yml
@@ -0,0 +1,46 @@
+applications:
+- opencontrail
+parameters:
+ _param:
+ opencontrail_compute_iface_mask: 24
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+ opencontrail:
+ common:
+ version: ${_param:opencontrail_version}
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ token: ${_param:keystone_service_token}
+ password: ${_param:keystone_admin_password}
+ network:
+ engine: neutron
+ host: ${_param:openstack_control_address}
+ port: 9696
+ compute:
+ version: ${_param:opencontrail_version}
+ disable_flow_collection: true
+ enabled: True
+ bind:
+ address: ${_param:single_address}
+ config:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ - host: ${_param:opencontrail_control_node02_address}
+ - host: ${_param:opencontrail_control_node03_address}
+ collector:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ interface:
+ address: ${_param:opencontrail_compute_address}
+ dev: ${_param:opencontrail_compute_iface}
+ gateway: ${_param:opencontrail_compute_gateway}
+ mask: ${_param:opencontrail_compute_iface_mask}
+ dns: ${_param:opencontrail_compute_dns}
+ mtu: 9000
+ nova:
+ compute:
+ networking: contrail
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
new file mode 100644
index 0000000..bd77c05
--- /dev/null
+++ b/opencontrail/compute/single4_0.yml
@@ -0,0 +1,44 @@
+applications:
+- opencontrail
+parameters:
+ _param:
+ opencontrail_compute_iface_mask: 24
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+ opencontrail:
+ common:
+ version: ${_param:opencontrail_version}
+ identity:
+ engine: keystone
+ host: ${_param:control_address}
+ port: 35357
+ token: ${_param:keystone_service_token}
+ password: ${_param:keystone_admin_password}
+ network:
+ engine: neutron
+ host: ${_param:control_address}
+ port: 9696
+ compute:
+ version: ${_param:opencontrail_version}
+ enabled: True
+ config:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ - host: ${_param:opencontrail_control_node02_address}
+ - host: ${_param:opencontrail_control_node03_address}
+ collector:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ interface:
+ address: ${_param:opencontrail_compute_address}
+ dev: ${_param:opencontrail_compute_iface}
+ gateway: ${_param:opencontrail_compute_gateway}
+ mask: ${_param:opencontrail_compute_iface_mask}
+ dns: ${_param:opencontrail_compute_dns}
+ mtu: 9000
+ nova:
+ compute:
+ networking: contrail
+
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
new file mode 100644
index 0000000..1984ee5
--- /dev/null
+++ b/opencontrail/control/analytics4_0.yml
@@ -0,0 +1,60 @@
+classes:
+- service.haproxy.proxy.single
+- service.keepalived.cluster.single
+- service.opencontrail.control.analytics
+- system.haproxy.proxy.listen.opencontrail.analytics
+parameters:
+ _param:
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+# Temprorary fix for MOS9 packages to pin old version of kafka
+ linux:
+ system:
+ package:
+ librdkafka1:
+ version: 0.9.0-0contrail0
+ hold: true
+ python-kafka:
+ version: 1.0.1-0contrail1
+ hold: true
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
+ opencontrail:
+ common:
+ identity:
+ host: ${_param:openstack_control_address}
+ network:
+ host: ${_param:openstack_control_address}
+ collector:
+ discovery:
+ host: None
+ database:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ analytics:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ message_queue:
+ host: ${_param:openstack_control_address}
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ config:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ - host: ${_param:opencontrail_control_node02_address}
+ - host: ${_param:opencontrail_control_node03_address}
+ database:
+ discovery:
+ host: None
+ analytics:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
new file mode 100644
index 0000000..5324fac
--- /dev/null
+++ b/opencontrail/control/cluster4_0.yml
@@ -0,0 +1,108 @@
+classes:
+- service.haproxy.proxy.single
+- service.keepalived.cluster.single
+- service.opencontrail.control.cluster
+- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.analytics
+parameters:
+ _param:
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+# Temprorary fix for MOS9 packages to pin old version of kafka
+ linux:
+ system:
+ package:
+ librdkafka1:
+ version: 0.9.0-0contrail0
+ python-kafka:
+ version: 1.0.1-0contrail1
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
+ opencontrail:
+ common:
+ identity:
+ host: ${_param:openstack_control_address}
+ network:
+ host: ${_param:openstack_control_address}
+ collector:
+ discovery:
+ host: None
+ database:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ analytics:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ message_queue:
+ host: ${_param:openstack_control_address}
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ config:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ database:
+ discovery:
+ host: None
+ analytics:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ config:
+ network:
+ host: ${_param:openstack_control_address}
+ bind:
+ address: ${_param:cluster_local_address}
+ discovery:
+ host: None
+ analytics:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ identity:
+ region: ${_param:openstack_region}
+ host: ${_param:openstack_control_address}
+ control:
+ analytics:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ database:
+ members:
+ - host: ${_param:cluster_node01_address}
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ discovery:
+ host: None
+ web:
+ analytics:
+ host: ${_param:opencontrail_control_address}
+ cache:
+ host: 127.0.0.1
+ identity:
+ host: ${_param:openstack_control_address}
+ database:
+ port: 9042
+ network:
+ host: ${_param:openstack_control_address}
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
new file mode 100644
index 0000000..ae03dea
--- /dev/null
+++ b/opencontrail/control/control4_0.yml
@@ -0,0 +1,74 @@
+classes:
+- service.keepalived.cluster.single
+- service.opencontrail.control.control
+- system.haproxy.proxy.listen.opencontrail.control
+parameters:
+ _param:
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+ opencontrail:
+ common:
+ identity:
+ host: ${_param:openstack_control_address}
+ network:
+ host: ${_param:openstack_control_address}
+ config:
+ network:
+ host: ${_param:openstack_control_address}
+ bind:
+ address: ${_param:cluster_local_address}
+ discovery:
+ host: None
+ analytics:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ identity:
+ region: ${_param:openstack_region}
+ host: ${_param:openstack_control_address}
+ control:
+ analytics:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ database:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ - host: ${_param:opencontrail_control_node02_address}
+ - host: ${_param:opencontrail_control_node03_address}
+ discovery:
+ host: None
+ web:
+ analytics:
+ host: ${_param:opencontrail_analytics_address}
+ cache:
+ host: 127.0.0.1
+ identity:
+ host: ${_param:openstack_control_address}
+ database:
+ port: 9042
+ network:
+ host: ${_param:openstack_control_address}
+ database:
+ analytics:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ linux:
+ system:
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
new file mode 100644
index 0000000..cbd6520
--- /dev/null
+++ b/opencontrail/control/single4_0.yml
@@ -0,0 +1,138 @@
+classes:
+- service.opencontrail.control.single
+- service.haproxy.proxy.single
+parameters:
+ _param:
+ opencontrail_version: 4.0
+ linux_repo_contrail_component: oc40
+# Temprorary fix for MOS9 packages to pin old version of kafka
+ linux:
+ system:
+ package:
+ librdkafka1:
+ version: 0.9.0-0contrail0
+ python-kafka:
+ version: 1.0.1-0contrail1
+ contrail-api-cli:
+ version: latest
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
+ haproxy:
+ proxy:
+ listen:
+ contrail_api:
+ type: contrail-api
+ service_name: contrail
+ check: false
+ binds:
+ - address: ${_param:single_address}
+ port: 8082
+ servers:
+ - name: ctl01
+ host: ${_param:single_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ contrail_discovery:
+ type: contrail-api
+ service_name: contrail
+ binds:
+ - address: ${_param:single_address}
+ port: 5998
+ servers:
+ - name: ctl01
+ host: ${_param:single_address}
+ port: 9110
+ params: check inter 2000 rise 2 fall 3
+ contrail_config_stats:
+ type: contrail-config
+ service_name: contrail
+ format: listen
+ binds:
+ - address: '*'
+ port: 5937
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_openstack_stats:
+ type: contrail-config
+ service_name: contrail
+ format: listen
+ binds:
+ - address: '*'
+ port: 5936
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_collector_stats:
+ type: contrail-config
+ service_name: contrail
+ format: listen
+ binds:
+ - address: '*'
+ port: 5938
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ opencontrail:
+ common:
+ identity:
+ host: ${_param:openstack_control_address}
+ network:
+ host: ${_param:openstack_control_address}
+ config:
+ network:
+ host: ${_param:openstack_control_address}
+ bind:
+ address: ${_param:single_address}
+ discovery:
+ host: None
+ analytics:
+ members:
+ - host: ${_param:single_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_address}
+ identity:
+ region: ${_param:openstack_region}
+ host: ${_param:openstack_control_address}
+ control:
+ analytics:
+ members:
+ - host: ${_param:single_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_address}
+ database:
+ members:
+ - host: ${_param:single_address}
+ discovery:
+ host: None
+ web:
+ analytics:
+ host: ${_param:single_address}
+ cache:
+ host: 127.0.0.1
+ identity:
+ host: ${_param:openstack_control_address}
+ database:
+ port: 9042
+ network:
+ host: ${_param:openstack_control_address}
+ database:
+ analytics:
+ members:
+ - host: ${_param:single_address}
+ collector:
+ discovery:
+ host: None
+ database:
+ members:
+ - host: ${_param:single_address}
+ analytics:
+ members:
+ - host: ${_param:single_address}
+ message_queue:
+ host: ${_param:openstack_control_address}
+ members:
+ - host: ${_param:openstack_control_address}
+ config:
+ members:
+ - host: ${_param:single_address}
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index 5d2a20a..84c44ac 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -17,10 +17,10 @@
image: ${_param:salt_control_xenial_image}
size: openstack.gateway
gtw02:
- provider: kvm01.${_param:cluster_domain}
+ provider: kvm02.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
size: openstack.gateway
gtw03:
- provider: kvm01.${_param:cluster_domain}
+ provider: kvm03.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
size: openstack.gateway