X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fkeystone.yaml;h=b6cfa21e5533ed67f3641a0584acf11388dfbf53;hb=b3a4a6e5123b767d2dacdd1915e96b850753071b;hp=5b253b46a8f9517de3dcbe22b751420b62d71c45;hpb=e9cf19340a070362bc39cd1a69d38ca742bb645a;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 5b253b46..b6cfa21e 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-keystone:latest'
     type: string
+  DockerKeystoneConfigImage:
+    description: The container image to use for the keystone config_volume
+    default: 'centos-binary-keystone:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -86,27 +90,30 @@ outputs:
         config_volume: keystone
         puppet_tags: keystone_config
         step_config: *step_config
-        config_image: &keystone_image
+        config_image: &keystone_config_image
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/keystone.json:
           command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # Kolla_bootstrap/db sync runs before permissions set by kolla_config
-        step_3:
+        step_2:
           keystone_init_log:
-            start_order: 0
-            image: *keystone_image
+            image: &keystone_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
             user: root
             command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone']
             volumes:
               - /var/log/containers/keystone:/var/log/keystone
+        step_3:
           keystone_db_sync:
-            start_order: 1
             image: *keystone_image
             net: host
+            user: root
             privileged: false
             detach: false
             volumes: &keystone_volumes
@@ -146,6 +153,7 @@ outputs:
           keystone_bootstrap:
             start_order: 3
             action: exec
+            user: root
             command:
               [ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ]
       docker_puppet_tasks:
@@ -154,7 +162,7 @@ outputs:
           config_volume: 'keystone_init_tasks'
           puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain'
           step_config: 'include ::tripleo::profile::base::keystone'
-          config_image: *keystone_image
+          config_image: *keystone_config_image
       host_prep_tasks:
         - name: create persistent logs directory
           file: