X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-noha%2Fopenstack_control.yml.j2;h=e383edd161aa927c75b84487180f05ff213a0dd0;hb=af1a4adfcc75b1dae16aee766679fcd224158d00;hp=c5e004ad1a78beb47689ae80995e0b1e87f0aaf7;hpb=325500c5e2b79b93bc0b507f62111e5b178d3768;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index c5e004ad1..e383edd16 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.nfs.server
   - system.ceilometer.client
   - system.ceilometer.client.neutron
@@ -47,31 +46,29 @@ classes:
   - service.barbican.server.plugin.simple_crypto
   - 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.aodh
   - system.apache.server.site.gnocchi
   - system.apache.server.site.panko
   - system.apache.server.site.barbican
   - system.apache.server.single
   - system.horizon.server.single
+  - system.nginx.server.single
+  - system.nginx.server.proxy.openstack_web
   - service.haproxy.proxy.single
 {%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
   - system.keystone.client.service.tacker
   - system.galera.server.database.tacker
   - service.tacker.server.single
 {%- endif %}
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-noha.haproxy_openstack_api
   - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
-    linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
     ceilometer_endpoint_status: absent
     barbican_integration_enabled: 'false'
@@ -90,10 +87,8 @@ parameters:
         volume_device_name: sdc
       pkgs:
         - keystone
-        - python-psycopg2
-        - python-mysqldb
-        - python-openstackclient
-        - python-tornado
+        - python3-memcache
+        - python3-openstackclient
     client:
       enabled: true
       resources:
@@ -125,14 +120,19 @@ parameters:
         enabled: ${_param:barbican_integration_enabled}
       identity:
         barbican_endpoint: ${barbican:server:host_href}
+      pkgs:
+        - glance
+      services:
+        - glance-api
   cinder:
     controller:
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - cinder-api
+        - cinder-scheduler
   nova:
     controller:
-      networking: dvr
-      cpu_allocation: 54
       metadata:
         password: ${_param:metadata_password}
       bind:
@@ -143,6 +143,13 @@ parameters:
       workers: 1
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - nova-api
+        - nova-conductor
+        - nova-consoleauth
+        - nova-scheduler
+        - nova-novncproxy
+        - python3-novaclient
   horizon:
     server:
       # yamllint disable-line rule:truthy
@@ -175,6 +182,14 @@ parameters:
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}
+  gnocchi:
+    common:
+      storage:
+        driver: redis
+        redis_url: redis://${_param:single_address}:6379
+        incoming:
+          driver: redis
+          redis_url: redis://${_param:single_address}:6379
   nfs:
     server:
       share:
@@ -212,6 +227,7 @@ parameters:
           <<: *wsgi_threads
         barbican_admin:
           <<: *wsgi_threads
+      mod_wsgi: libapache2-mod-wsgi-py3
   barbican:
     server:
       ks_notifications_enable: true
@@ -220,3 +236,12 @@ parameters:
           crypto_plugin: simple_crypto
           store_plugin: store_crypto
           global_default: true
+  rabbitmq:
+    server:
+      env_variables:
+        hostname: localhost
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          enabled: false