Browse code

Merge "Zuul: add file extension to playbook path"

Zuul authored on 2017/11/21 07:23:07
Showing 1 changed files
... ...
@@ -48,7 +48,7 @@
48 48
         ADMIN_PASSWORD: secretadmin
49 49
         SERVICE_PASSWORD: secretservice
50 50
         NETWORK_GATEWAY: 10.1.0.1
51
-        Q_USE_DEBUG_COMMAND: True
51
+        Q_USE_DEBUG_COMMAND: true
52 52
         FIXED_RANGE: 10.1.0.0/20
53 53
         IPV4_ADDRS_SAFE_TO_USE: 10.1.0.0/20
54 54
         FLOATING_RANGE: 172.24.5.0/24
... ...
@@ -56,25 +56,24 @@
56 56
         FLOATING_HOST_PREFIX: 172.24.4
57 57
         FLOATING_HOST_MASK: 23
58 58
         SWIFT_REPLICAS: 1
59
-        SWIFT_START_ALL_SERVICES: False
59
+        SWIFT_START_ALL_SERVICES: false
60 60
         LOGFILE: /opt/stack/logs/devstacklog.txt
61
-        LOG_COLOR: False
62
-        VERBOSE: True
63
-        NETWORK_GATEWAY: 10.1.0.1
64
-        NOVNC_FROM_PACKAGE: True
65
-        ERROR_ON_CLONE: True
61
+        LOG_COLOR: false
62
+        VERBOSE: true
63
+        NOVNC_FROM_PACKAGE: true
64
+        ERROR_ON_CLONE: true
66 65
         # Gate jobs can't deal with nested virt. Disable it.
67 66
         LIBVIRT_TYPE: qemu
68 67
         # NOTE(dims): etcd 3.x is not available in debian/ubuntu
69 68
         # etc. As a stop gap measure, devstack uses wget to download
70 69
         # from the location below for all the CI jobs.
71
-        ETCD_DOWNLOAD_URL: "http://tarballs.openstack.org/etcd/"
70
+        ETCD_DOWNLOAD_URL: http://tarballs.openstack.org/etcd/
72 71
       devstack_services:
73
-        horizon: False
74
-        tempest: False
75
-    pre-run: playbooks/pre
76
-    run: playbooks/devstack
77
-    post-run: playbooks/post
72
+        horizon: false
73
+        tempest: false
74
+    pre-run: playbooks/pre.yaml
75
+    run: playbooks/devstack.yaml
76
+    post-run: playbooks/post.yaml
78 77
 
79 78
 
80 79
 - project: