mirror of https://github.com/rancher/ui.git
add 'None' option to docker install url for node templates
rancher/rancher#30895
This commit is contained in:
parent
a32bc18d70
commit
aff49e2e21
|
|
@ -473,7 +473,7 @@ export default Component.extend(NodeDriver, {
|
|||
|
||||
return resolve(set(this, 'allKmsKeys', kmsKeys));
|
||||
} catch (err) {
|
||||
console.warn('Unable to load KMS Keys.', err); // eslint-disable-line
|
||||
// console.warn('Unable to load KMS Keys.', err); // eslint-disable-line
|
||||
// node template owners MAY not have access to KMS keys via IAM so dont kill everything because they dont
|
||||
// its not required
|
||||
set(this, 'loadFailedKmsKeys', true);
|
||||
|
|
@ -488,7 +488,7 @@ export default Component.extend(NodeDriver, {
|
|||
|
||||
KMS.listKeys({}, (err, data) => {
|
||||
if (err) {
|
||||
console.error(err, err.stack);
|
||||
// console.warn(err, err.stack);
|
||||
|
||||
return reject(err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ export default Component.extend({
|
|||
label: get(this, 'intl').t('formEngineOpts.engineInstallUrl.latest'),
|
||||
value: 'https://get.docker.com'
|
||||
},
|
||||
{
|
||||
label: get(this, 'intl').t('formEngineOpts.engineInstallUrl.none.label'),
|
||||
value: 'None'
|
||||
},
|
||||
];
|
||||
|
||||
return out;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@
|
|||
</BasicDropdown>
|
||||
</div>
|
||||
</div>
|
||||
{{#if (eq machine.engineInstallURL "None")}}
|
||||
<p class="help-block pt-5 text-warning">
|
||||
{{t "formEngineOpts.engineInstallUrl.none.help"}}
|
||||
</p>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
<hr />
|
||||
|
|
|
|||
|
|
@ -6327,6 +6327,9 @@ formEngineOpts:
|
|||
placeholder: e.g. http://get.docker.com/
|
||||
recommended: Recommended
|
||||
latest: Latest
|
||||
none:
|
||||
label: None
|
||||
help: "Warning: When selecting a value of 'None', Rancher will not install docker under the assumption that the docker is already installed."
|
||||
engineStorageDriver:
|
||||
label: Storage Driver
|
||||
placeholder: e.g. overlay
|
||||
|
|
|
|||
Loading…
Reference in New Issue