ovs and oc aio lab fixes
Change-Id: I07bb37b17e049eb7cccf5900b64d70524ac3ab51
diff --git a/classes/cluster/os_aio_contrail/infra/config.yml b/classes/cluster/os_aio_contrail/infra/config.yml
index 1615fd4..000ac6e 100755
--- a/classes/cluster/os_aio_contrail/infra/config.yml
+++ b/classes/cluster/os_aio_contrail/infra/config.yml
@@ -15,13 +15,11 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_control_cluster
+# system.keystone.client.service.designate
+#- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_single
- system.reclass.storage.system.opencontrail_control_cluster
- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
- cluster.os_aio_contrail.openstack.proxy
- cluster.os_aio_contrail
parameters:
@@ -48,32 +46,62 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: prx
+ host: ${_param:openstack_control_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
reclass:
storage:
- node:
- openstack_control_node01:
- classes:
- - service.galera.master.cluster
- params:
- mysql_cluster_role: master
- linux_system_codename: xenial
- openstack_control_node02:
- classes:
- - service.galera.slave.cluster
- params:
- mysql_cluster_role: slave
- linux_system_codename: xenial
- openstack_control_node03:
- classes:
- - service.galera.slave.cluster
- params:
- mysql_cluster_role: slave
- linux_system_codename: xenial
- openstack_proxy_node01:
- classes:
- - cluster.os_aio_contrail.openstack.proxy
- params:
- linux_system_codename: xenial
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control01:
+ expression: <<node_hostname>>__equals__ntw01
+ cluster_param:
+ opencontrail_control_node01_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control02:
+ expression: <<node_hostname>>__equals__ntw02
+ cluster_param:
+ opencontrail_control_node02_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control03:
+ expression: <<node_hostname>>__equals__ntw03
+ cluster_param:
+ opencontrail_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
diff --git a/classes/cluster/os_aio_contrail/infra/init.yml b/classes/cluster/os_aio_contrail/infra/init.yml
index 5e41624..81b8485 100755
--- a/classes/cluster/os_aio_contrail/infra/init.yml
+++ b/classes/cluster/os_aio_contrail/infra/init.yml
@@ -2,8 +2,8 @@
_param:
cluster_domain: os_aio_contrail.local
cluster_name: os_aio_contrail
- infra_config_deploy_address: 192.168.10.100
- infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
linux:
diff --git a/classes/cluster/os_aio_contrail/opencontrail/init.yml b/classes/cluster/os_aio_contrail/opencontrail/init.yml
index cee0b50..102198a 100644
--- a/classes/cluster/os_aio_contrail/opencontrail/init.yml
+++ b/classes/cluster/os_aio_contrail/opencontrail/init.yml
@@ -9,9 +9,9 @@
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02
opencontrail_control_node03_hostname: ntw03
- opencontrail_control_node01_address: 172.16.10.111
- opencontrail_control_node02_address: 172.16.10.112
- opencontrail_control_node03_address: 172.16.10.113
+ opencontrail_control_node01_address: 172.16.10.92
+ opencontrail_control_node02_address: 172.16.10.93
+ opencontrail_control_node03_address: 172.16.10.94
linux:
network:
host:
diff --git a/classes/cluster/os_aio_contrail/openstack/compute.yml b/classes/cluster/os_aio_contrail/openstack/compute.yml
index 2c2f5b5..e84e5c2 100755
--- a/classes/cluster/os_aio_contrail/openstack/compute.yml
+++ b/classes/cluster/os_aio_contrail/openstack/compute.yml
@@ -3,22 +3,13 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.nova.compute.cluster
+#- system.nova.compute.cluster
- system.opencontrail.compute.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.virtual_router
-- service.opencontrail.compute.cluster
- cluster.os_aio_contrail
parameters:
_param:
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
opencontrail_compute_address: ${_param:single_address}
opencontrail_compute_gateway: 172.16.10.1
opencontrail_compute_iface: ens4
@@ -43,23 +34,72 @@
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
- message_queue:
- members:
- - host: ${_param:openstack_control_node01_address}
- - host: ${_param:openstack_control_node02_address}
- - host: ${_param:openstack_control_node03_address}
notification:
driver: messagingv2
topics: "notifications"
notify_on:
state_change: vm_and_task_state
+ version: ${_param:nova_version}
+ enabled: true
+ virtualization: kvm
+ heal_instance_info_cache_interval: 60
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ bind:
+ vnc_address: ${_param:cluster_local_address}
+ vnc_port: 6080
+ vnc_name: 0.0.0.0
+ database:
+ engine: mysql
+ host: ${_param:cluster_vip_address}
+ port: 3306
+ name: nova
+ user: nova
+ password: ${_param:mysql_nova_password}
+ identity:
+ engine: keystone
+ region: RegionOne
+ host: ${_param:cluster_vip_address}
+ port: 35357
+ user: nova
+ password: ${_param:keystone_nova_password}
+ tenant: service
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:cluster_vip_address}
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ image:
+ engine: glance
+ host: ${_param:cluster_vip_address}
+ port: 9292
+ network:
+ engine: neutron
+ region: RegionOne
+ host: ${_param:cluster_vip_address}
+ port: 9696
+ user: neutron
+ tenant: service
+ password: ${_param:keystone_neutron_password}
+ cache:
+ engine: memcached
+ members:
+ - host: ${_param:cluster_node01_address}
+ port: 11211
+ user:
+ public_key: ${_param:nova_compute_ssh_public}
+ private_key: ${_param:nova_compute_ssh_private}
+ openssh:
+ client:
+ enabled: True
+ user: {}
+ stricthostkeychecking: False
ceilometer:
agent:
message_queue:
members:
- host: ${_param:openstack_control_node01_address}
- - host: ${_param:openstack_control_node02_address}
- - host: ${_param:openstack_control_node03_address}
opencontrail:
common:
network:
diff --git a/classes/cluster/os_aio_contrail/openstack/control.yml b/classes/cluster/os_aio_contrail/openstack/control.yml
index 0f23675..84bb3c4 100755
--- a/classes/cluster/os_aio_contrail/openstack/control.yml
+++ b/classes/cluster/os_aio_contrail/openstack/control.yml
@@ -1,52 +1,36 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
-- system.rabbitmq.server.cluster
+- system.rabbitmq.server.single
- system.rabbitmq.server.vhost.openstack
- system.keystone.server.wsgi
-- system.keystone.server.cluster
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- system.glance.control.cluster
-- system.nova.control.cluster
-- system.neutron.control.opencontrail.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.designate
+- system.keystone.server.single
+- system.glance.control.single
+- system.nova.control.single
+- system.neutron.control.opencontrail.single
+- system.cinder.control.single
+- system.heat.server.single
+- system.ceilometer.server.single
+- system.aodh.server.single
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_contrail.openstack.dashboard
- cluster.os_aio_contrail
parameters:
- _param:
- keepalived_vip_interface: ens4
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- keepalived_openstack_telemetry_vip_interface: ens4
+ mysql:
+ server:
+ version: '5.6'
+ max_connections: 20000
linux:
system:
package:
@@ -60,59 +44,54 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- keepalived:
- cluster:
- instance:
- VIP:
- virtual_router_id: 150
- bind:
- server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
+ # bind:
+ # server:
+ # control:
+ # mgmt:
+ # enabled: true
+ # bind:
+ # address: ${_param:single_address}
+ # port: 953
+ # allow:
+ # - ${_param:openstack_control_node01_address}
+ # - ${_param:openstack_control_node02_address}
+ # - ${_param:openstack_control_node03_address}
+ # keys:
+ # - designate
keystone:
server:
admin_email: ${_param:admin_email}
notification:
driver: messagingv2
topics: "notifications"
- designate:
- server:
- pools:
- default:
- description: 'test pool'
- targets:
- default:
- description: 'test target1'
- default1:
- type: ${_param:designate_pool_target_type}
- description: 'test target2'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node02_address}
- port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- default2:
- type: ${_param:designate_pool_target_type}
- description: 'test target3'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node03_address}
- port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ # designate:
+ # server:
+ # pools:
+ # default:
+ # description: 'test pool'
+ # targets:
+ # default:
+ # description: 'test target1'
+ # default1:
+ # type: ${_param:designate_pool_target_type}
+ # description: 'test target2'
+ # masters: ${_param:designate_pool_target_masters}
+ # options:
+ # host: ${_param:openstack_control_node02_address}
+ # port: 53
+ # rndc_host: ${_param:openstack_control_node02_address}
+ # rndc_port: 953
+ # rndc_key_file: /etc/designate/rndc.key
+ # default2:
+ # type: ${_param:designate_pool_target_type}
+ # description: 'test target3'
+ # masters: ${_param:designate_pool_target_masters}
+ # options:
+ # host: ${_param:openstack_control_node03_address}
+ # port: 53
+ # rndc_host: ${_param:openstack_control_node03_address}
+ # rndc_port: 953
+ # rndc_key_file: /etc/designate/rndc.key
glance:
server:
storage:
@@ -133,9 +112,9 @@
cpu_allocation: 54
bind:
private_address: ${_param:cluster_local_address}
- public_address: ${_param:cluster_vip_address}
+ public_address: ${_param:openstack_control_node01_address}
novncproxy_port: 6080
- vncproxy_url: http://${_param:cluster_vip_address}:6080
+ vncproxy_url: http://${_param:openstack_control_node01_address}:6080
cache:
engine: memcached
prefix: CACHE_NOVA
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index 20d4c9b..0e22e71 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -1,43 +1,25 @@
parameters:
_param:
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_hostname: prx01
- openstack_proxy_node01_address: 172.16.10.121
-
- openstack_control_address: 172.16.10.254
+ openstack_control_address: ${_param:openstack_control_node01_address}
openstack_control_node01_hostname: ctl01
- openstack_control_node02_hostname: ctl02
- openstack_control_node03_hostname: ctl03
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
+ openstack_control_node01_address: 172.16.10.91
- openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_address: ${_param:openstack_control_node01_address}
openstack_database_node01_hostname: dbs01
- openstack_database_node02_hostname: dbs02
- openstack_database_node03_hostname: dbs03
openstack_database_node01_address: ${_param:openstack_control_node01_address}
- openstack_database_node02_address: ${_param:openstack_control_node02_address}
- openstack_database_node03_address: ${_param:openstack_control_node02_address}
-
- openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_address: ${_param:openstack_control_node01_address}
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_hostname: msg03
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
- openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
- openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
openstack_compute_node01_hostname: cmp01
openstack_compute_node02_hostname: cmp02
- openstack_compute_node01_address: 172.16.10.105
- openstack_compute_node02_address: 172.16.10.106
+ openstack_compute_node01_address: 172.16.10.95
+ openstack_compute_node02_address: 172.16.10.96
openstack_version: ocata
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
- cluster_public_host: 172.16.10.254
+ cluster_public_host: ${_param:openstack_control_node01_address}
opencontrail_version: 3.0
opencontrail_compute_dns: 8.8.8.8
opencontrail_stats_password: contrail123
@@ -48,33 +30,6 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- designate_pool_nameservers:
- - host: ${_param:openstack_control_node01_address}
- port: 53
- - host: ${_param:openstack_control_node02_address}
- port: 53
- - host: ${_param:openstack_control_node03_address}
- port: 53
- designate_pool_target_type: bind9
- designate_pool_target_masters:
- - host: ${_param:openstack_control_node01_address}
- port: 5354
- - host: ${_param:openstack_control_node02_address}
- port: 5354
- - host: ${_param:openstack_control_node03_address}
- port: 5354
- designate_pool_target_options:
- host: ${_param:openstack_control_node01_address}
- port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- designate_version: ${_param:openstack_version}
cluster_vip_address: ${_param:openstack_control_address}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
@@ -134,16 +89,6 @@
linux:
network:
host:
- prx:
- address: ${_param:openstack_proxy_address}
- names:
- - prx
- - prx.${_param:cluster_domain}
- prx01:
- address: ${_param:openstack_proxy_node01_address}
- names:
- - ${_param:openstack_proxy_node01_hostname}
- - prx01.${_param:cluster_domain}
ctl:
address: ${_param:openstack_control_address}
names:
@@ -154,16 +99,6 @@
names:
- ${_param:openstack_control_node01_hostname}
- ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- ctl02:
- address: ${_param:openstack_control_node02_address}
- names:
- - ${_param:openstack_control_node02_hostname}
- - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
- ctl03:
- address: ${_param:openstack_control_node03_address}
- names:
- - ${_param:openstack_control_node03_hostname}
- - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
msg:
address: ${_param:openstack_message_queue_address}
names:
@@ -174,16 +109,6 @@
names:
- ${_param:openstack_message_queue_node01_hostname}
- ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- msg02:
- address: ${_param:openstack_message_queue_node02_address}
- names:
- - ${_param:openstack_message_queue_node02_hostname}
- - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
- msg03:
- address: ${_param:openstack_message_queue_node03_address}
- names:
- - ${_param:openstack_message_queue_node03_hostname}
- - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
dbs:
address: ${_param:openstack_database_address}
names:
@@ -194,16 +119,6 @@
names:
- ${_param:openstack_database_node01_hostname}
- ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- dbs02:
- address: ${_param:openstack_database_node02_address}
- names:
- - ${_param:openstack_database_node02_hostname}
- - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
- dbs03:
- address: ${_param:openstack_database_node03_address}
- names:
- - ${_param:openstack_database_node03_hostname}
- - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
cmp01:
address: ${_param:openstack_compute_node01_address}
names:
diff --git a/classes/cluster/os_aio_contrail/openstack/proxy.yml b/classes/cluster/os_aio_contrail/openstack/proxy.yml
index d92ae91..f732096 100755
--- a/classes/cluster/os_aio_contrail/openstack/proxy.yml
+++ b/classes/cluster/os_aio_contrail/openstack/proxy.yml
@@ -8,7 +8,6 @@
- cluster.os_aio_contrail
parameters:
_param:
- cluster_vip_address: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/os_aio_ovs/infra/config.yml b/classes/cluster/os_aio_ovs/infra/config.yml
index 08e7333..79783a7 100644
--- a/classes/cluster/os_aio_ovs/infra/config.yml
+++ b/classes/cluster/os_aio_ovs/infra/config.yml
@@ -14,11 +14,9 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
-- system.mysql.client.single
- system.reclass.storage.system.openstack_control_single
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
-- system.reclass.storage.system.openstack_dashboard_single
- cluster.os_aio_ovs.openstack.proxy
- cluster.os_aio_ovs
parameters:
@@ -47,7 +45,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: ${_param:cluster_node01_address}
+ host: ${_param:openstack_control_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
@@ -104,10 +102,10 @@
cluster_param:
openstack_gateway_node01_address:
value_template: <<node_control_ip>>
- node:
- openstack_control_node01:
- params:
- mysql_cluster_role: master
+ # node:
+ # openstack_control_node01:
+ # params:
+ # mysql_cluster_role: master
# nginx:
diff --git a/classes/cluster/os_aio_ovs/infra/init.yml b/classes/cluster/os_aio_ovs/infra/init.yml
index 517da8f..fee7829 100644
--- a/classes/cluster/os_aio_ovs/infra/init.yml
+++ b/classes/cluster/os_aio_ovs/infra/init.yml
@@ -2,8 +2,8 @@
_param:
cluster_domain: os_aio_ovs.local
cluster_name: os_aio_ovs
- infra_config_deploy_address: 192.168.10.100
- infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
linux:
network:
host:
diff --git a/classes/cluster/os_aio_ovs/openstack/compute.yml b/classes/cluster/os_aio_ovs/openstack/compute.yml
index 64fc04d..7d66331 100644
--- a/classes/cluster/os_aio_ovs/openstack/compute.yml
+++ b/classes/cluster/os_aio_ovs/openstack/compute.yml
@@ -2,8 +2,8 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
+- system.nova.compute.single
+- service.neutron.compute.single
- cluster.os_aio_ovs
parameters:
_param:
@@ -22,6 +22,14 @@
state_change: vm_and_task_state
message_queue:
host: ${_param:openstack_control_node01_address}
+ image:
+ engine: glance
+ host: ${_param:glance_service_host}
+ port: 9292
+ network:
+ engine: neutron
+ host: ${_param:neutron_service_host}
+ port: 9696
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/os_aio_ovs/openstack/control.yml b/classes/cluster/os_aio_ovs/openstack/control.yml
index 38ed2ba..d5ebcaa 100644
--- a/classes/cluster/os_aio_ovs/openstack/control.yml
+++ b/classes/cluster/os_aio_ovs/openstack/control.yml
@@ -21,34 +21,49 @@
- system.cinder.control.single
- system.heat.server.single
#- system.galera.server.cluster
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
+# - system.galera.server.database.ceilometer
+# - system.galera.server.database.cinder
+# - system.galera.server.database.glance
+# - system.galera.server.database.heat
+# - system.galera.server.database.keystone
+# - system.galera.server.database.nova
+
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_ovs.openstack.dashboard
- cluster.os_aio_ovs
parameters:
- _param:
- galera_server_cluster_name: galeracluster
- galera_server_bind_address: ${_param:cluster_local_address}
- galera_server_bind_port: 3306
- galera_server_admin_user: root
- galera:
- master:
- enabled: true
- name: ${_param:galera_server_cluster_name}
- bind:
- address: ${_param:galera_server_bind_address}
- port: ${_param:galera_server_bind_port}
- maintenance_password: ${_param:galera_server_maintenance_password}
- admin:
- user: ${_param:galera_server_admin_user}
- password: ${_param:galera_server_admin_password}
- members:
- - host: ${_param:openstack_control_node01_address}
- port: 4567
-##################
+# _param:
+# galera_server_cluster_name: galeracluster
+# galera_server_bind_address: ${_param:cluster_local_address}
+# galera_server_bind_port: 3306
+# galera_server_admin_user: root
+# galera:
+# master:
+# enabled: true
+# name: ${_param:galera_server_cluster_name}
+# bind:
+# address: ${_param:galera_server_bind_address}
+# port: ${_param:galera_server_bind_port}
+# maintenance_password: ${_param:galera_server_maintenance_password}
+# admin:
+# user: ${_param:galera_server_admin_user}
+# password: ${_param:galera_server_admin_password}
+# members:
+# - host: ${_param:openstack_control_node01_address}
+# port: 4567
+# ##################
+ mysql:
+ server:
+ version: '5.6'
+ max_connections: 20000
linux:
system:
package:
diff --git a/classes/cluster/os_aio_ovs/openstack/gateway.yml b/classes/cluster/os_aio_ovs/openstack/gateway.yml
index 7792236..37918a2 100644
--- a/classes/cluster/os_aio_ovs/openstack/gateway.yml
+++ b/classes/cluster/os_aio_ovs/openstack/gateway.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
+- service.neutron.gateway.single
- cluster.os_aio_ovs
parameters:
_param:
@@ -75,4 +75,11 @@
use_interfaces:
- ${_param:external_interface}
use_ovs_ports:
- - float-to-ex
\ No newline at end of file
+ - float-to-ex
+ neutron:
+ gateway:
+ dvr: ${_param:neutron_gateway_dvr}
+ qos: ${_param:neutron_enable_qos}
+ agent_mode: ${_param:neutron_gateway_agent_mode}
+ backend:
+ tenant_network_types: ${_param:neutron_tenant_network_types}"
\ No newline at end of file
diff --git a/classes/cluster/os_aio_ovs/openstack/init.yml b/classes/cluster/os_aio_ovs/openstack/init.yml
index b7f244c..58229ef 100644
--- a/classes/cluster/os_aio_ovs/openstack/init.yml
+++ b/classes/cluster/os_aio_ovs/openstack/init.yml
@@ -1,14 +1,14 @@
parameters:
_param:
openstack_control_address: ${_param:openstack_control_node01_address}
- openstack_control_node01_address: 172.16.10.101
+ openstack_control_node01_address: 172.16.10.91
openstack_database_address: ${_param:openstack_control_node01_address}
openstack_message_queue_address: ${_param:openstack_control_node01_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
openstack_gateway_address: ${_param:openstack_gateway_node01_address}
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_address: 172.16.10.110
+ openstack_gateway_node01_address: 172.16.10.92
openstack_version: ocata
@@ -35,7 +35,7 @@
cluster_vip_address: ${_param:openstack_control_node01_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -104,12 +104,12 @@
- gtw01
- gtw01.${_param:cluster_domain}
cmp01:
- address: 172.16.10.105
+ address: 172.16.10.93
names:
- cmp01
- cmp01.${_param:cluster_domain}
cmp02:
- address: 172.16.10.106
+ address: 172.16.10.94
names:
- cmp02
- cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/os_ha_ovs/infra/init.yml b/classes/cluster/os_ha_ovs/infra/init.yml
index 98ed614..d5b51f9 100644
--- a/classes/cluster/os_ha_ovs/infra/init.yml
+++ b/classes/cluster/os_ha_ovs/infra/init.yml
@@ -2,8 +2,8 @@
_param:
cluster_domain: os_ha_ovs.local
cluster_name: os_ha_ovs
- infra_config_deploy_address: 192.168.10.100
- infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
linux:
network:
host:
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index 5920112..771c191 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -9,13 +9,13 @@
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
+ openstack_control_node01_address: 172.16.10.91
+ openstack_control_node02_address: 172.16.10.92
+ openstack_control_node03_address: 172.16.10.93
openstack_gateway_hostname: gtw
openstack_gateway_address: ${_param:openstack_gateway_node01_address}
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_address: 172.16.10.110
+ openstack_gateway_node01_address: 172.16.10.94
openstack_database_address: ${_param:openstack_control_address}
openstack_message_queue_address: ${_param:openstack_control_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}