diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-noha')
5 files changed, 48 insertions, 52 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml index 21653d7cb..7235071f5 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml @@ -45,17 +45,6 @@ parameters: host: ${_param:cluster_node01_address} port: 9191 params: ${_param:haproxy_check} - glare: - type: general-service - service_name: glare - binds: - - address: ${_param:cluster_vip_address} - port: 9494 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} heat_cloudwatch_api: type: openstack-service service_name: heat @@ -139,18 +128,6 @@ parameters: host: ${_param:cluster_node01_address} port: 8778 params: ${_param:haproxy_check} - nova_ec2_api: - type: general-service - service_name: nova - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8773 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} nova_api: type: openstack-service service_name: nova diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml index 3d84e6c18..8b6a74d7a 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml @@ -14,6 +14,7 @@ classes: - system.ceilometer.agent.cluster - system.ceilometer.client.nova_compute - system.ceilometer.client.cinder_volume + - system.ceilometer.agent.polling.default - system.linux.system.repo.mcp.openstack - cluster.mcp-pike-common-noha.openstack_compute_pdf parameters: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml index 01b320973..29b2d627e 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml @@ -8,9 +8,8 @@ --- classes: - system.linux.system.lowmem + - system.linux.system.repo.mcp.openstack - service.nfs.server - - system.mongodb.server.single - - system.mongodb.server.database.ceilometer - system.ceilometer.client - system.ceilometer.client.neutron - system.memcached.server.single @@ -21,10 +20,11 @@ classes: - system.keystone.client.single - system.keystone.client.service.nova21 - system.keystone.client.service.nova-placement - - system.keystone.client.service.glare - system.keystone.client.service.cinder3 - system.keystone.client.service.ceilometer - system.keystone.client.service.aodh + - system.keystone.client.service.gnocchi + - system.keystone.client.service.panko - system.glance.control.single - system.nova.control.single - system.cinder.control.single @@ -39,8 +39,21 @@ classes: - system.galera.server.database.nova - system.galera.server.database.ceilometer - system.galera.server.database.aodh + - system.galera.server.database.gnocchi + - system.galera.server.database.panko + - service.redis.server.single - service.ceilometer.server.single + - system.ceilometer.server.coordination.redis + - system.ceilometer.server.backend.default - system.aodh.server.single + - system.aodh.server.coordination.redis + - system.gnocchi.server.single + - system.gnocchi.common.storage.incoming.redis + - system.gnocchi.common.storage.redis + - system.gnocchi.common.coordination.redis + - service.panko.server.single + - system.apache.server.site.gnocchi + - system.apache.server.site.panko - system.horizon.server.single - service.haproxy.proxy.single - cluster.mcp-pike-common-noha.haproxy_openstack_api @@ -48,6 +61,7 @@ classes: parameters: _param: linux_system_codename: xenial + ceilometer_create_gnocchi_resources: 'True' linux: system: package: @@ -58,6 +72,11 @@ parameters: admin_email: ${_param:admin_email} openrc_extra: volume_device_name: vdc + pkgs: + - keystone + - python-psycopg2 + - python-mysqldb + - python-openstackclient glance: server: storage: @@ -76,13 +95,6 @@ parameters: novncproxy_port: 6080 vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 - pkgs: - - nova-api - - nova-conductor - - nova-consoleauth - - nova-novncproxy - - nova-scheduler - - python-novaclient horizon: server: # yamllint disable-line rule:truthy @@ -106,12 +118,15 @@ parameters: thread_cache_size: 12 query_cache_limit: 2 query_cache_size: 0 - mongodb: + ceilometer: server: + ~database: ~ + redis: + server: + version: 3.0 + appendfsync: 'no' bind: - address: ${_param:cluster_local_address},127.0.0.1 - logging: - verbose: v + address: ${_param:single_address} nfs: server: share: @@ -128,3 +143,9 @@ parameters: server: vlan_aware_vms: true root_helper_daemon: false + apache: + server: + site: + gnocchi: + wsgi: + threads: 1 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml index 8061bb1fe..5edf48c31 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml @@ -7,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.mcp.openstack - cluster.mcp-pike-common-noha.openstack_gateway_pdf parameters: _param: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml index 7c6ce90b7..ff99b9b42 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml @@ -84,26 +84,22 @@ parameters: horizon_identity_host: ${_param:cluster_vip_address} horizon_identity_encryption: none horizon_identity_version: 3 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: opnfv_secret - mongodb_admin_password: opnfv_secret - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth aodh_version: ${_param:openstack_version} keystone_aodh_password: opnfv_secret aodh_service_host: ${_param:cluster_local_address} + gnocchi_version: 4.0 + gnocchi_service_host: ${_param:cluster_local_address} + mysql_gnocchi_password: opnfv_secret + keystone_gnocchi_password: opnfv_secret + panko_version: ${_param:openstack_version} + panko_service_host: ${_param:cluster_local_address} + mysql_panko_password: opnfv_secret + keystone_panko_password: opnfv_secret + ceilometer_agent_default_polling_interval: 180 + ceilometer_agent_default_polling_meters: + - "*" linux: system: - repo: - uca-staging: - # yamllint disable rule:line-length - source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main" - key_id: 9F68104E - key_server: keyserver.ubuntu.com - # yamllint enable rule:line-length - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" - key_id: EC4926EA - key_server: keyserver.ubuntu.com kernel: sysctl: net.ipv4.tcp_congestion_control: yeah |