Partial-Bug: #1694851 - Addressing provision failures when done throu…

…gh UI

Certain HA parameters are expected if ha section is there
Certain sample parameters have been removed/missing from schema

Change-Id: I6209e4a90070cdcc3fab7a7ace0426ad3426fa8a

src/client/new-cluster-contrail-4.x.json

@@ -36,7 +36,6 @@
                             "external_lb": false,
                             "external_rabbitmq_servers" : "1.1.1.1, 2.2.2.2",
                             "external_zookeeper_servers": "1.1.1.1, 2.2.2.2",
-                            "external_cassandra_servers": "1.1.1.1, 2.2.2.2",
                             "external_configdb_servers" : "1.1.1.1, 2.2.2.2",
                             "xmpp_auth_enable": false,
                             "xmpp_dns_auth_enable": false,
@@ -61,10 +60,11 @@
                             "flow_export_rate": "10"
                         },
                         "control_config": {
-                            "log_file": "/var/log/contrail/contrail-control.log",
+                            "log": "/var/log/contrail/contrail-control.log",
                             "log_level": "SYS_NOTICE"
                         },
                         "dns_config": {
+                            "log": "/var/log/contrail/contrail-dns.log",
                             "log_level": "SYS_NOTICE"
                         },
                         "cassandra_config": {
@@ -115,12 +115,12 @@
                             "log": "/var/log/contrail/contrail-snmp-collector.log",
                             "log_level": "SYS_NOTICE",
                             "introspect_port": "5920",
-                            "scan_frequencey": "600",
+                            "scan_frequency": "600",
                             "fast_scan_frequency": "60"
                         },
                         "topology_config": {
                             "log": "/var/log/contrail/contrail-topology.log",
-                            "log_level": "SYS_NOTICIE"
+                            "log_level": "SYS_NOTICE"
                         },
                         "storage_ceph_config": {
                             "replica_size": 2,

src/server_mgr_main.py

@@ -5468,7 +5468,7 @@ def get_calculated_openstack_cfg_dict(self, cluster, cluster_srvrs):
             hacfg = self.get_cluster_openstack_cfg_section(cluster, "ha")
             cluster_ops_cfg = self.get_cluster_openstack_cfg_section(cluster, None)
             external_openstack_ip = cluster_ops_cfg.get("external_openstack_ip", None)
-            if hacfg:
+            if hacfg and "internal_vip" in hacfg:
                 openstack_cfg["ctrl_data_ip"] = hacfg["internal_vip"]
                 openstack_cfg["management_ip"] = hacfg["external_vip"]
             elif external_openstack_ip:
@@ -5554,7 +5554,7 @@ def get_calculated_keystone_cfg_dict(self, cluster, cluster_srvrs):
             hacfg = self.get_cluster_openstack_cfg_section(cluster, "ha")
             cluster_ops_cfg = self.get_cluster_openstack_cfg_section(cluster, None)
             external_openstack_ip = cluster_ops_cfg.get("external_openstack_ip", None)
-            if hacfg:
+            if hacfg and "internal_vip" in hacfg:
                 keystone_cfg["ip"] = hacfg["internal_vip"]
             elif external_openstack_ip:
                 keystone_cfg["ip"] = external_openstack_ip