Use the translated hiera_data
This commit is contained in:
parent
3454533ee8
commit
331f405bd3
|
@ -1,3 +1,14 @@
|
|||
coe_host: "https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443"
|
||||
kube_context: "kubernetes-admin@kubernetes"
|
||||
config_file: /root/.kube/config
|
||||
|
||||
hiera_data: {}
|
||||
hiera_data_file: ''
|
||||
|
||||
keystone_config:
|
||||
DEFAULT:
|
||||
public_bind_host: "0.0.0.0"
|
||||
database:
|
||||
connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
|
||||
token:
|
||||
provider: "fernet"
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
include_role:
|
||||
name: 'ansible-role-k8s-tripleo'
|
||||
vars:
|
||||
hieradata:
|
||||
hieradata: '{{hiera_data}}'
|
||||
hieradata_file: '{{hiera_data_file}}'
|
||||
schema:
|
||||
keystone::admin_token: DEFAULT.admin_token
|
||||
keystone::admin_workers: eventlet_server.admin_workers
|
||||
|
@ -28,6 +29,7 @@
|
|||
keystone::rabbit_host: oslo_messaging_rabbit.rabbit_host
|
||||
fact_variable: 'keystone_config'
|
||||
|
||||
|
||||
# keystone::admin_password: DEFAULT.admin_password ?
|
||||
# keystone::service_name: 'httpd'
|
||||
# keystone::cron::token_flush::destination: '/dev/null'
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
- httpd-keystone-admin.conf
|
||||
- keystone-schema.yaml
|
||||
|
||||
- include: hiera.yaml
|
||||
|
||||
- name: Run oslo.config
|
||||
include_role:
|
||||
name: os-gen-config
|
||||
|
@ -27,13 +29,7 @@
|
|||
config_show_help: false
|
||||
config_show_defaults: false
|
||||
dest: "/tmp/keystone.conf"
|
||||
config_data:
|
||||
DEFAULT:
|
||||
public_bind_host: "0.0.0.0"
|
||||
database:
|
||||
connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
|
||||
token:
|
||||
provider: "fernet"
|
||||
config_data: '{{keystone_config}}'
|
||||
|
||||
- name: Read configs into memory
|
||||
slurp:
|
||||
|
|
Loading…
Reference in New Issue