Rectify system reclass after update

* add opendaylight password (removed from system level)
* get updated ovn system class w/o mysql settings
* enable ceilometer user back (removed along with outdated service/endpoints)
* adjsut check interval of haproxy for noha scenarios since there is
  only one backend for services, i.e. failover ain't expected

Change-Id: Iedee290e1cfcf838998bd44dc09a729d143974ac
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index 0397f9d..fa85ab7 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -111,6 +111,7 @@ parameters:
     cluster:
       saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main"
       region:
+        host: ${_param:single_address}
         port: 5240
   linux:
     system:

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
index b28cfe7..3ec73be 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
@@ -17,6 +17,7 @@ parameters:
         mcp_glusterfs:
           # yamllint disable-line rule:line-length
           source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_glusterfs_key}
           pin:
             - package: '*'
               pin: release o=LP-PPA-gluster-glusterfs-${_param:glusterfs_version}

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
index f567855..93548f6 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
@@ -13,17 +13,23 @@ classes:
   - system.keystone.client.service.nova-placement
   - system.keystone.client.service.cinder3
   - system.keystone.client.service.designate
+  - system.keystone.client.service.ceilometer
   - system.keystone.client.service.gnocchi
   - system.keystone.client.service.panko
   - system.keystone.client.service.barbican
   - system.keystone.client.v3.service.keystone
 parameters:
+  _param:
+    ceilometer_endpoint_status: absent
   keystone:
     client:
       enabled: true
       resources:
         v3:
           enabled: true
+          services:
+            ceilometer:
+              status: absent
       server:
         identity:
           admin:

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
index 1cde4d4..9796693 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
@@ -25,6 +25,7 @@ parameters:
     cluster_vip_address: ${_param:openstack_proxy_address}
     keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address}
     keepalived_openstack_web_public_vip_interface: ${_param:single_nic}
+    keepalived_openstack_web_public_vip_password: ${_param:opnfv_main_password}
     keepalived_vip_address: ${_param:openstack_proxy_control_address}
     keepalived_vip_interface: ${_param:control_nic}
     keepalived_vip_virtual_router_id: 240

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
index 66f5968..dd3bc47 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
+    haproxy_check: check inter 30m fastinter 2s downinter 4s rise 3 fall 3
   haproxy:
     proxy:
       listen:

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 9f39d03..77476ac 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -22,6 +22,7 @@ classes:
   - system.keystone.client.service.nova21
   - system.keystone.client.service.nova-placement
   - 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
@@ -72,6 +73,7 @@ parameters:
   _param:
     linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
+    ceilometer_endpoint_status: absent
     barbican_integration_enabled: 'false'
   linux:
     system:
@@ -97,6 +99,9 @@ parameters:
       resources:
         v3:
           enabled: true
+          services:
+            ceilometer:
+              status: absent
       server:
         identity:
           admin:

diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
index cd0d498..fe5a297 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
@@ -21,3 +21,7 @@ parameters:
         sdn_controller_password: ${_param:opendaylight_password}
         sdn_controller_webport: ${_param:opendaylight_rest_port}
         sdn_controller_restconfport: ${_param:opendaylight_rest_port}
+  neutron:
+    server:
+      backend:
+        password: ${_param:opendaylight_password}

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
index a41a8b2..4b0beb5 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
@@ -34,3 +34,7 @@ parameters:
         sdn_controller_password: ${_param:opendaylight_password}
         sdn_controller_webport: ${_param:opendaylight_rest_port}
         sdn_controller_restconfport: ${_param:opendaylight_rest_port}
+  neutron:
+    server:
+      backend:
+        password: ${_param:opendaylight_password}

diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 95c1012..6589ee6 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 95c10122851430bdddaecd14cba3438d671e6462
+Subproject commit 6589ee66d78889ab0e078064f1afa21eb7f61e77