diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-05 10:47:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-05 10:47:48 +0000 |
| commit | 73656aac0dbf1e0bbc8ee10cf5f282c93af4174b (patch) | |
| tree | 7bf46742f4d79b31c1b86e35333a7a05a2f295ea /puppet/controller.yaml | |
| parent | dfcfb9d4de5ecc4b624ea4497718cb98e80b2d7e (diff) | |
| parent | 80a1acb55ed60b1bf86e9cf2d463dbe814c2489f (diff) | |
Merge "Move *Image parameters into role templates"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8013ecf4..cfde7e03 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -117,9 +117,9 @@ parameters: description: Secret key for Django type: string hidden: true - Image: + controllerImage: type: string - default: overcloud-control + default: overcloud-full constraints: - custom_constraint: glance.image ImageUpdatePolicy: @@ -340,7 +340,7 @@ resources: os-collect-config: command: {get_param: ConfigCommand} properties: - image: {get_param: Image} + image: {get_param: controllerImage} image_update_policy: {get_param: ImageUpdatePolicy} flavor: {get_param: Flavor} key_name: {get_param: KeyName} |