Merge "Update docker configuration for api tests."

docker/api_ci/create_default_flavor.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+case $# in
+    0)
+        HOST=localhost
+        PORT=8888;;
+    1)
+        HOST=$1
+        PORT=8888;;
+    2)
+        HOST=$1
+        PORT=$2;;
+esac
+
+curl --include \
+     --request POST \
+     --header "Content-Type: application/json" \
+     --header "X-Project-ID: 123456" \
+     --data-binary '{
+    "id" : "cdn",
+    "limits": [{
+        "origins": {
+            "min": 1,
+            "max": 5
+        },
+        "domains" : {
+            "min": 1,
+            "max": 5
+        },
+        "caching": {
+            "min": 3600,
+            "max": 604800,
+            "incr": 300
+        }
+    }],
+    "providers" : [
+        {
+            "provider" : "akamai",
+            "links": [
+                {
+                    "href": "http://www.akamai.com",
+                    "rel": "provider_url"
+                }
+            ]
+        }
+    ]
+}' "http://$HOST:$PORT/v1.0/flavors"

docker/api_ci/poppy.conf

@@ -14,6 +14,8 @@ log_file = poppy.log
 
 ;auth_strategy =
 
+project_id_in_url = True
+
 # ================= Syslog Options ============================
 
 # Send logs to syslog (/dev/log) instead of to file specified
@@ -36,20 +38,36 @@ manager = default
 storage = cassandra
 
 # Provider modules list (a list of comma separated provider module list)
-providers = fastly
+#providers = fastly
+providers = akamai
 
 # DNS driver module (e.g., default, designate, rackspace)
-dns = rackspace
-
-#[drivers:transport:pecan]
-#bind = 0.0.0.0
-#port = 8081
+#dns = rackspace
+dns = default
+
+[drivers:dns:rackspace]
+username = "USERNAME"
+api_key = "API_KEY"
+use_shards = True
+num_shards = 499
+shard_prefix = "cdn"
+url = "example.com"
+email = "email@example.com"
 
 [drivers:storage:cassandra]
 cluster = "cassandra"
 keyspace = poppy
 
-[drivers:provider:fastly]
-apikey = "MYAPIKEY"
-scheme = "http"
-host = "mimic:8900/fastly"
+[drivers:provider:akamai]
+policy_api_client_token = POLICY-API-CLIENT-TOKEN
+policy_api_client_secret = POLICY-API-CLIENT-SECRET
+policy_api_access_token = POLICY-API-ACCESS-TOKEN
+policy_api_base_url = POLICY-API-BASE-URL
+ccu_api_client_token = CCU-API-CLIENT-TOKEN
+ccu_api_client_secret = CCU-API-CLIENT-SECRET
+ccu_api_access_token = CCU-API-ACCESS-TOKEN
+ccu_api_base_url = CCU-API-BASE-URL
+akamai_access_url_link = AKAMAI-ACCESS-URL-LINK
+akamai_https_access_url_suffix = AKAMAI-HTTPS-ACCESS-URL-SUFFIX
+akamai_http_config_number = AKAMAI-HTTP-CONFIG-NUMBER
+akamai_https_config_number = AKAMAI-HTTPS-CONFIG-NUMBER

docker/api_ci/uwsgi.ini

@@ -3,13 +3,7 @@ master = true
 chdir = /home/poppy/
 workers = 4
 http-socket = 0.0.0.0:8081
-logger = file:/var/log/poppy/poppy.log
-pidfile = /var/run/poppy/poppy.pid
+virtualenv = /usr/bin
 die-on-term = true
-enable-threads = true
-buffer-size = 32768
-max-requests = 15000
-no-orphans = true
-vacuum = true
 module = poppy.transport.app:app
-py-auto-reload = 1
+need_app = true

docker/fig/fig_mimic.yml

@@ -5,9 +5,10 @@ mimic:
 poppy:
     build: ../../.
     ports:
-        - "80:8081"
+        - "8888:8081"
     volumes:
         - ../../:/home/poppy
+        - /etc/localtime:/etc/localtime:ro
     command:
         - /root/start_poppy.sh
     links: