cleanup opencontrail metadata/remove unused gluster definition for keystone and glance
diff --git a/glance/control/storage/glusterfs.yml b/glance/control/storage/glusterfs.yml
deleted file mode 100644
index ae0e84d..0000000
--- a/glance/control/storage/glusterfs.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-classes:
-- service.glusterfs.server
-- service.glusterfs.client
-parameters:
- glusterfs:
- server:
- peers:
- - ${_param:cluster_node01_address}
- - ${_param:cluster_node02_address}
- - ${_param:cluster_node03_address}
- volumes:
- glance:
- storage: /srv/glusterfs/glance
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/glance
- - ${_param:cluster_node02_address}:/srv/glusterfs/glance
- - ${_param:cluster_node03_address}:/srv/glusterfs/glance
- options:
- cluster.readdir-optimize: On
- nfs.disable: On
- network.remote-dio: On
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
- client:
- volumes:
- glance:
- path: /var/lib/glance/images
- server: ${_param:glusterfs_service_host}
- user: glance
- group: glance
- glance:
- server:
- storage:
- engine: file
- images: []
diff --git a/keystone/server/storage/glusterfs.yml b/keystone/server/storage/glusterfs.yml
deleted file mode 100644
index 54a4197..0000000
--- a/keystone/server/storage/glusterfs.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-classes:
-- service.glusterfs.server
-- service.glusterfs.client
-parameters:
- glusterfs:
- server:
- peers:
- - ${_param:cluster_node01_address}
- - ${_param:cluster_node02_address}
- - ${_param:cluster_node03_address}
- volumes:
- keystone-keys:
- storage: /srv/glusterfs/keystone-keys
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/keystone-keys
- - ${_param:cluster_node02_address}:/srv/glusterfs/keystone-keys
- - ${_param:cluster_node03_address}:/srv/glusterfs/keystone-keys
- options:
- cluster.readdir-optimize: On
- nfs.disable: On
- network.remote-dio: On
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
- client:
- volumes:
- keystone-keys:
- path: /var/lib/keystone/fernet-keys
- server: ${_param:glusterfs_service_host}
- user: keystone
- group: keystone
- keystone:
- server:
- tokens:
- location: /var/lib/keystone/fernet-keys
diff --git a/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
index 5baa97e..caaaf6d 100644
--- a/neutron/control/opencontrail/cluster.yml
+++ b/neutron/control/opencontrail/cluster.yml
@@ -20,33 +20,13 @@
rights: all
neutron:
server:
- enabled: true
dns_domain: ${_param:cluster_domain}
- version: ${_param:neutron_version}
- bind:
- address: ${_param:cluster_local_address}
- port: 9696
database:
- engine: mysql
host: ${_param:openstack_database_address}
- port: 3306
- name: neutron
- user: neutron
- password: ${_param:mysql_neutron_password}
identity:
- engine: keystone
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
- port: 35357
- user: neutron
- password: ${_param:keystone_neutron_password}
- tenant: service
message_queue:
- engine: rabbitmq
- port: 5672
- user: openstack
- password: ${_param:rabbitmq_openstack_password}
- virtual_host: '/openstack'
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
@@ -54,13 +34,11 @@
compute:
host: ${_param:openstack_control_address}
region: ${_param:openstack_region}
- user: nova
- password: ${_param:keystone_nova_password}
- tenant: service
- plugin: contrail
- tunnel_type: vxlan
- public_networks: []
- contrail:
- version: ${_param:opencontrail_version}
-
-
+ backend:
+ engine: contrail
+ host: ${_param:opencontrail_control_address}
+ port: 8082
+ user: admin
+ password: ${_param:keystone_admin_password}
+ tenant: admin
+ token: ${_param:keystone_service_token}
\ No newline at end of file
diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 9e3d78d..8cbd166 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -16,42 +16,13 @@
hold: true
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:opencontrail_control_address}
- port: 9696
collector:
- version: ${_param:opencontrail_version}
- enabled: true
- bind:
- address: ${_param:cluster_local_address}
- port: 9081
- master:
- host: ${_param:cluster_local_address}
discovery:
host: ${_param:opencontrail_control_address}
- data_ttl: 1
database:
- version: ${_param:opencontrail_version}
- cassandra:
- version: 2
- enabled: true
- name: 'Contrail'
- minimum_disk: 10
- original_token: 0
- data_dirs:
- - /var/lib/cassandra
- id: ${_param:opencontrail_database_id}
discovery:
host: ${_param:opencontrail_control_address}
- bind:
- host: ${_param:cluster_local_address}
- port: 9042
- rpc_port: 9160
\ No newline at end of file
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index a3fefc3..794682d 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -7,98 +7,31 @@
multi_tenancy: false
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:cluster_vip_address}
- port: 9696
config:
- version: ${_param:opencontrail_version}
- enabled: true
multi_tenancy: ${_param:multi_tenancy}
network:
- engine: neutron
- host: ${_param:cluster_vip_address}
- port: 9696
- discovery:
host: ${_param:cluster_vip_address}
analytics:
host: ${_param:opencontrail_analytics_address}
bind:
address: ${_param:cluster_local_address}
- api_port: 9100
- discovery_port: 9110
message_queue:
- engine: rabbitmq
host: ${_param:openstack_message_queue_address}
- port: 5672
identity:
- engine: keystone
- version: '2.0'
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
- port: 35357
- user: admin
- password: '${_param:keystone_admin_password}'
- token: '${_param:keystone_service_token}'
- tenant: admin
- control:
- version: ${_param:opencontrail_version}
- enabled: true
- id: ${_param:opencontrail_database_id}
- bind:
- address: ${_param:cluster_local_address}
- discovery:
- host: ${_param:cluster_vip_address}
- master:
- host: ${_param:cluster_local_address}
- database:
- version: ${_param:opencontrail_version}
- cassandra:
- version: 2
- enabled: true
- name: 'Contrail'
- minimum_disk: 10
- original_token: 0
- data_dirs:
- - /var/lib/cassandra
- id: ${_param:opencontrail_database_id}
- discovery:
- host: ${_param:cluster_vip_address}
- bind:
- host: ${_param:cluster_local_address}
- port: 9042
- rpc_port: 9160
web:
- version: ${_param:opencontrail_version}
- enabled: True
- bind:
- address: ${_param:cluster_local_address}
analytics:
host: ${_param:opencontrail_analytics_address}
- master:
- host: ${_param:cluster_vip_address}
cache:
- engine: redis
host: 127.0.0.1
- port: 6379
identity:
- engine: keystone
- version: '2.0'
host: ${_param:openstack_control_address}
- port: 35357
- user: admin
- password: '${_param:keystone_admin_password}'
- token: '${_param:keystone_service_token}'
- tenant: admin
database:
port: 9042
network:
- engine: neutron
host: ${_param:cluster_vip_address}