ovs and oc aio lab fixes
Change-Id: I07bb37b17e049eb7cccf5900b64d70524ac3ab51
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}