Fix test_server_software_config scenario test

In commit 4ca172ae78 we changed to
use heatclient utilities to load files and it broke this test.

File mode must be string from Puppet 4 onwards, so the inline
manifest also needs to be fixed.

Note: This test is not run in the gate.

Change-Id: Ia0be1aab36448b291ea43371a5d906fa79eb3753
This commit is contained in:
Rabi Mishra 2019-02-01 22:11:30 +05:30
parent ad04045b63
commit 9fe7820864
2 changed files with 6 additions and 6 deletions

View File

@ -52,7 +52,7 @@ resources:
- name: bar
outputs:
- name: result
config: {get_file: cfg1.sh}
config: {get_file: /cfg1.sh}
cfg2a:
type: OS::Heat::StructuredConfig
@ -87,7 +87,7 @@ resources:
- name: bar
outputs:
- name: result
config: {get_file: cfg3.pp}
config: {get_file: /cfg3.pp}
dep1:
type: OS::Heat::SoftwareDeployment

View File

@ -27,14 +27,14 @@ echo "Output to stderr" 1>&2
CFG3_PP = '''file {'barfile':
ensure => file,
mode => 0644,
mode => '0644',
path => "/tmp/$::bar",
content => "$::foo",
}
file {'output_result':
ensure => file,
path => "$::heat_outputs_path.result",
mode => 0644,
mode => '0644',
content => "The file /tmp/$::bar contains $::foo for server \
$::deploy_server_id during $::deploy_action",
}
@ -153,8 +153,8 @@ class SoftwareConfigIntegrationTest(scenario_base.ScenarioTestsBase):
}
files = {
'cfg1.sh': CFG1_SH,
'cfg3.pp': CFG3_PP
'file:///cfg1.sh': CFG1_SH,
'file:///cfg3.pp': CFG3_PP
}
env_files, env = template_utils.process_environment_and_files(