diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 02:04:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 02:04:21 +0000 |
| commit | c76feac1a9d80c545330085c9928b6ff15f58096 (patch) | |
| tree | 05e33a7e991d7ab94e82cd8fa28cdd45a951195d /environments | |
| parent | 25acb53ddfc15644b9803b66a5e2f8203ddc188c (diff) | |
| parent | d0acf566066126ef41f85dacf825ceb6e850cc62 (diff) | |
Merge "Add DeployedServerEnvironmentOutput"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/overcloud-baremetal.j2.yaml | 1 | ||||
| -rw-r--r-- | environments/overcloud-services.yaml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml index 668e28de..8d7bc8d9 100644 --- a/environments/overcloud-baremetal.j2.yaml +++ b/environments/overcloud-baremetal.j2.yaml @@ -4,6 +4,7 @@ resource_registry: OS::TripleO::DefaultPasswords: OS::Heat::None OS::TripleO::RandomString: OS::Heat::None OS::TripleO::AllNodesDeployment: OS::Heat::None + OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml parameter_defaults: # Deploy no services diff --git a/environments/overcloud-services.yaml b/environments/overcloud-services.yaml index c409b899..1d01cb3c 100644 --- a/environments/overcloud-services.yaml +++ b/environments/overcloud-services.yaml @@ -1,3 +1,6 @@ +resource_registry: + OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml + parameter_defaults: # Consistent Hostname format ControllerDeployedServerHostnameFormat: overcloud-controller-%index% |