Merge "Move the Hiera symlink task from post configuration to deployment steps."
This commit is contained in:
commit
b881a5e8e7
|
@ -513,7 +513,14 @@ outputs:
|
||||||
hieradata_variable_end_string: $$
|
hieradata_variable_end_string: $$
|
||||||
hieradata_files: "{{ '{{' }} lookup('file', '{{role.name}}/deployment-hierarchy.yaml') {{ '}}' }}"
|
hieradata_files: "{{ '{{' }} lookup('file', '{{role.name}}/deployment-hierarchy.yaml') {{ '}}' }}"
|
||||||
when: tripleo_role_name == '{{role.name}}'
|
when: tripleo_role_name == '{{role.name}}'
|
||||||
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
- name: Hiera symlink
|
||||||
|
file:
|
||||||
|
src: /etc/puppet/hiera.yaml
|
||||||
|
dest: /etc/hiera.yaml
|
||||||
|
state: link
|
||||||
|
force: true
|
||||||
tags:
|
tags:
|
||||||
- overcloud
|
- overcloud
|
||||||
- pre_deploy_steps
|
- pre_deploy_steps
|
||||||
|
|
|
@ -37,34 +37,6 @@ parameters:
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
StandalonePostConfig:
|
|
||||||
type: OS::Heat::SoftwareConfig
|
|
||||||
properties:
|
|
||||||
group: ansible
|
|
||||||
inputs:
|
|
||||||
- name: ansible_python_interpreter
|
|
||||||
description: Python interpreter to use for the ansible execution
|
|
||||||
default: {get_param: PythonInterpreter}
|
|
||||||
config: |
|
|
||||||
---
|
|
||||||
- name: StandalonePostConfig
|
|
||||||
connection: local
|
|
||||||
hosts: localhost
|
|
||||||
tasks:
|
|
||||||
- name: Hiera symlink
|
|
||||||
file:
|
|
||||||
src: /etc/puppet/hiera.yaml
|
|
||||||
dest: /etc/hiera.yaml
|
|
||||||
state: link
|
|
||||||
force: yes
|
|
||||||
|
|
||||||
StandalonePostDeployment:
|
|
||||||
type: OS::Heat::SoftwareDeploymentGroup
|
|
||||||
properties:
|
|
||||||
name: StandalonePostDeployment
|
|
||||||
servers: {get_param: servers}
|
|
||||||
config: {get_resource: StandalonePostConfig}
|
|
||||||
|
|
||||||
CloudsYamlConfig:
|
CloudsYamlConfig:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml
|
|
||||||
|
|
||||||
HOMEDIR="$homedir"
|
HOMEDIR="$homedir"
|
||||||
USERNAME=`ls -ld $HOMEDIR | awk {'print $3'}`
|
USERNAME=`ls -ld $HOMEDIR | awk {'print $3'}`
|
||||||
GROUPNAME=`ls -ld $HOMEDIR | awk {'print $4'}`
|
GROUPNAME=`ls -ld $HOMEDIR | awk {'print $4'}`
|
||||||
|
|
Loading…
Reference in New Issue