update the API doc for the generator and include the generator container in the automation compose
Change-Id: I442f0273cf22323949c1031516cd81de1e1b9028
diff --git a/API.md b/API.md
index 9d1fd09..b6f370e 100644
--- a/API.md
+++ b/API.md
@@ -353,7 +353,20 @@
|/config/|POST|Generates and returns a CORD leaf - spine configuration file|
##### POST /config/
-This request will interigate the specified ONOS instance and if the expected
+This request will interrogate the specified ONOS instance and if the expected
number of switches and hosts are in ONOS it will then generate a configuration
file suitable to use for the CORD leaf - spine fabric and return that to the
caller.
+
+|Name|Type|Required|Description|
+|-|-|-|-|
+|switchcount|number|yes|number of hosts expected to be found in ONOS when generating a configuration|
+|hostcount|number|yes|number of hosts expected to be found in ONOS when generating a configuration|
+
+*example:*
+```
+{
+ "switchcount" : 4,
+ "hostcount" : 4
+}
+```
diff --git a/roles/maas/templates/automation-compose.yml.j2 b/roles/maas/templates/automation-compose.yml.j2
index f99c68c..85a97c0 100644
--- a/roles/maas/templates/automation-compose.yml.j2
+++ b/roles/maas/templates/automation-compose.yml.j2
@@ -104,3 +104,16 @@
command: [ "-apiVersion", "1.0", "-apikey", "{{ apikey.stdout }}", "-maas", "http://{{ mgmt_ip_address.stdout }}/MAAS", "-period", "30s", "-mappings", "@/mappings/mappings.json", "-always-rename" ]
restart: unless-stopped
+ generator:
+ image: "docker-registry:5000/config-generator:{{ docker.image_version }}"
+ container_name: generator
+ labels:
+ - "lab.solution=CORD"
+ - "lab.component=generator"
+ environment:
+ - "CONFIGGEN_PORT=8181"
+ - "CONFIGGEN_IP=onos-fabric"
+ - "CONFIGGEN_CONFIGSERVERPORT=1337"
+ - "CONFIGGEN_CONFIGSERVERIP=0.0.0.0"
+ restart: unless-stopped
+