Latest working

provision-keystone-apb/tasks/main.yaml

@@ -16,6 +16,7 @@
   with_items:
     - httpd.conf
     - httpd-keystone-main.conf
+    - httpd-keystone-admin.conf
     - keystone-schema.yaml
 
 - name: Run oslo.config
@@ -27,17 +28,23 @@
     config_show_defaults: false
     dest: "/tmp/keystone.conf"
     config_data:
-        DEFAULT:
-          bind_host: "0.0.0.0"
-          sql_connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
-        token:
-          provider: "fernet"
+      DEFAULT:
+        public_bind_host: "0.0.0.0"
+      database:
+        connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
+      token:
+        provider: "fernet"
 
 - name: Read configs into memory
   slurp:
     src: "/tmp/httpd-keystone-main.conf"
   register: "httpd_keystone_main_conf"
 
+- name: Read configs into memory
+  slurp:
+    src: "/tmp/httpd-keystone-admin.conf"
+  register: "httpd_keystone_admin_conf"
+
 - name: Read configs into memory
   slurp:
     src: "/tmp/httpd.conf"
@@ -97,6 +104,8 @@
         {{httpd_conf['content'] | b64decode}}
       httpd-keystone-main.conf: |
         {{httpd_keystone_main_conf['content'] | b64decode}}
+      httpd-keystone-admin.conf: |
+        {{httpd_keystone_admin_conf['content'] | b64decode}}
 
 
 - name: Create keystone job

provision-keystone-apb/templates/httpd-keystone-admin.conf

@@ -0,0 +1,22 @@
+<VirtualHost *:35357>
+  ## Vhost docroot
+  DocumentRoot "/var/www/cgi-bin/keystone"
+
+  ## Directories, there should at least be a declaration for /var/www/cgi-bin/keystone
+
+  <Directory "/var/www/cgi-bin/keystone">
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    Require all granted
+  </Directory>
+
+  ## Logging
+  # ErrorLog "/var/log/httpd/keystone_wsgi_admin_error.log"
+  ServerSignature Off
+  # CustomLog "/var/log/httpd/keystone_wsgi_admin_access.log" combined
+  WSGIApplicationGroup %{GLOBAL}
+  WSGIDaemonProcess keystone_admin display-name=keystone-admin group=keystone processes=2 threads=1 user=keystone
+  WSGIProcessGroup keystone_admin
+  WSGIScriptAlias / "/var/www/cgi-bin/keystone/admin"
+  WSGIPassAuthorization On
+</VirtualHost>

provision-keystone-apb/templates/httpd-keystone-main.conf

@@ -20,26 +20,3 @@
   WSGIScriptAlias / "/var/www/cgi-bin/keystone/main"
   WSGIPassAuthorization On
 </VirtualHost>
-tpd-keystone-admin.conf: |
-<VirtualHost *:35357>
-  ## Vhost docroot
-  DocumentRoot "/var/www/cgi-bin/keystone"
-
-  ## Directories, there should at least be a declaration for /var/www/cgi-bin/keystone
-
-  <Directory "/var/www/cgi-bin/keystone">
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverride None
-    Require all granted
-  </Directory>
-
-  ## Logging
-  # ErrorLog "/var/log/httpd/keystone_wsgi_admin_error.log"
-  ServerSignature Off
-  # CustomLog "/var/log/httpd/keystone_wsgi_admin_access.log" combined
-  WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess keystone_admin display-name=keystone-admin group=keystone processes=2 threads=1 user=keystone
-  WSGIProcessGroup keystone_admin
-  WSGIScriptAlias / "/var/www/cgi-bin/keystone/admin"
-  WSGIPassAuthorization On
-</VirtualHost>