Turn on opendaylight scenario

* fix formula & reclass cluster model
* bring in running states

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

4 files changed, 15 insertions, 19 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
index f0aed44e4..fdbff06b5 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
@@ -3,7 +3,6 @@ classes:
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.single
-- system.neutron.control.opendaylight.single
 - service.neutron.compute.single
 - cluster.virtual-mcp-ocata-odl
 parameters:
@@ -33,15 +32,7 @@ parameters:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
       ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
       tunnel_ip: ${_param:tenant_address}
-      provider_mappings: br-floating:float-to-ex
   linux:
-    system:
-      repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-          architectures: amd64
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
     network:
       bridge: openvswitch
       interface:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
index c8b6480cc..1918b87be 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
@@ -15,7 +15,7 @@ classes:
 - system.keystone.client.service.cinder3
 - system.glance.control.single
 - system.nova.control.single
-- system.neutron.control.openvswitch.single
+- system.neutron.control.opendaylight.single
 - system.cinder.control.single
 - system.heat.server.single
 - service.mysql.server.single
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
index 522998d24..4ea51f36f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
@@ -2,8 +2,7 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.neutron.control.opendaylight.single
-- service.neutron.gateway.single
+- system.neutron.gateway.opendaylight.single
 - cluster.virtual-mcp-ocata-odl
 parameters:
   _param:
@@ -12,9 +11,15 @@ parameters:
     external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
+    neutron_agents:
+    - neutron-l3-agent
+    - neutron-dhcp-agent
+    - neutron-metadata-agent
   neutron:
     gateway:
       agent_mode: ${_param:neutron_gateway_agent_mode}
+      pkgs: ${_param:neutron_agents}
+      services: ${_param:neutron_agents}
   opendaylight:
     client:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
@@ -22,13 +27,6 @@ parameters:
       tunnel_ip: ${_param:tenant_address}
       provider_mappings: br-floating:float-to-ex
   linux:
-    system:
-      repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-          architectures: amd64
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
     network:
       bridge: openvswitch
       interface:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
index 73445ac07..9857b9a76 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
@@ -89,6 +89,13 @@ parameters:
     keystone_aodh_password: opnfv_secret
     aodh_service_host: 172.16.10.108
   linux:
+    system:
+      repo:
+        uca:
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+          architectures: amd64
+          key_id: EC4926EA
+          key_server: keyserver.ubuntu.com
     network:
       host:
         ctl: