Merge "Add moonv4 into Compass4nfv"

5 files changed, 64 insertions, 12 deletions

diff --git a/deploy/compass_conf/flavor/openstack_ocata.conf b/deploy/compass_conf/flavor/openstack_ocata.conf
index c532ac6c..1179afae 100755
--- a/deploy/compass_conf/flavor/openstack_ocata.conf
+++ b/deploy/compass_conf/flavor/openstack_ocata.conf
@@ -25,7 +25,7 @@ FLAVORS = [{
     'display_name': 'HA-ansible-multinodes-ocata',
     'template': 'HA-ansible-multinodes.tmpl',
     'roles': [
-        'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
+        'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'ceph-osd-node', 'moon'
     ],
 }]
 
diff --git a/deploy/compass_conf/package_installer/ansible-ocata.conf b/deploy/compass_conf/package_installer/ansible-ocata.conf
index 0286b4eb..1df2153b 100755
--- a/deploy/compass_conf/package_installer/ansible-ocata.conf
+++ b/deploy/compass_conf/package_installer/ansible-ocata.conf
@@ -7,7 +7,7 @@ SETTINGS = {
     'playbook_file': 'site.yml',
     'inventory_file': 'inventory.py',
     'inventory_json_file': 'inventory.json',
-    'inventory_group': ['controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph_adm', 'ceph_mon', 'ceph_osd'],
+    'inventory_group': ['controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph_adm', 'ceph_mon', 'ceph_osd', 'moon'],
     'group_variable': 'all',
     'etc_hosts_path': 'roles/pre-openstack/templates/hosts',
     'runner_dirs': ['roles','openstack_ocata/templates','openstack_ocata/roles']
diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf
index cfe66356..f045868e 100755
--- a/deploy/compass_conf/package_metadata/openstack.conf
+++ b/deploy/compass_conf/package_metadata/openstack.conf
@@ -113,14 +113,6 @@ METADATA = {
             'default_value': 'Disable'
         }
     },
-    'moon': {
-        '_self': {
-            'mapping_to': 'moon',
-            'field': 'anytype',
-            'is_required':False,
-            'default_value': 'Disable'
-        }
-    },
     'plugins': {
         '_self': {
             'mapping_to': 'plugins',
@@ -471,5 +463,50 @@ METADATA = {
             }
         }
     },
-
+    'moon_cfg': {
+        '_self': {
+            'required_in_whole_config': False,
+            'mapping_to': 'moon_cfg'
+        },
+        'master': {
+            '_self': {
+                'required_in_whole_config': False,
+                'mapping_to': 'master'
+            },
+            'flag': {
+                '_self': {
+                    'is_required': False,
+                    'field': 'general',
+                    'mapping_to': 'flag'
+                }
+            },
+        },
+        'slave': {
+            '_self': {
+                'required_in_whole_config': False,
+                'mapping_to': 'slave'
+            },
+            'flag': {
+                '_self': {
+                    'is_required': False,
+                    'field': 'general',
+                    'mapping_to': 'flag'
+                }
+            },
+            'name': {
+                '_self': {
+                    'is_required': False,
+                    'field': 'general',
+                    'mapping_to': 'name'
+                }
+            },
+            'master_ip': {
+                '_self': {
+                    'is_required': False,
+                    'field': 'general',
+                    'mapping_to': 'master_ip'
+                }
+            },
+        }
+    }
 }
diff --git a/deploy/compass_conf/role/openstack_ocata_ansible.conf b/deploy/compass_conf/role/openstack_ocata_ansible.conf
index dfe426d0..bfb54173 100755
--- a/deploy/compass_conf/role/openstack_ocata_ansible.conf
+++ b/deploy/compass_conf/role/openstack_ocata_ansible.conf
@@ -112,4 +112,14 @@ ROLES = [{
     'display': 'sec-patch node',
     'description': 'Security Patch Node',
     'optional': True
+}, {
+    'role': 'none',
+    'display': 'none node',
+    'description': 'Only install OS Node',
+    'optional': True
+}, {
+    'role': 'moon',
+    'display': 'moon master or slave node',
+    'description': "Moon master/slave Node",
+    'optional': True
 }]
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
index 38b11edb..1fdc5d5e 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
@@ -56,7 +56,6 @@ enable_secgroup: $getVar('enable_secgroup', True)
 enable_fwaas: $getVar('enable_fwaas', True)
 enable_vpnaas: $getVar('enable_vpnaas', True)
 odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-moon: $getVar('moon', 'Disable')
 ha_network: $getVar('ha_network', 'Disable')
 onos_nic: $getVar('onos_nic', 'eth2')
 onos_sfc: $getVar('onos_sfc', 'Disable')
@@ -247,3 +246,9 @@ odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'ma
 odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
 odl_features: "{{ odl_base_features + odl_extra_features }}"
 odl_api_port: 8080
+
+#set moon_cfg = $getVar('moon_cfg', {})
+moon_master: $moon_cfg.master.flag
+moon_slave: $moon_cfg.slave.flag
+moon_slave_name: $moon_cfg.slave.name
+moon_master_ip: $moon_cfg.slave.master_ip