diff options
| author | Steve Milner <smilner@redhat.com> | 2017-05-24 09:52:09 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-05-25 13:42:15 -0400 |
| commit | 5e51be1def4658c3528c27923b01c90482e43cb5 (patch) | |
| tree | 21867e70485a16e7f4285d004393c234c9c5b5b5 /roles | |
| parent | a353d4daf48f37eb95affcff0cf318d90c055e7a (diff) | |
| download | openshift-5e51be1def4658c3528c27923b01c90482e43cb5.tar.gz openshift-5e51be1def4658c3528c27923b01c90482e43cb5.tar.bz2 openshift-5e51be1def4658c3528c27923b01c90482e43cb5.tar.xz openshift-5e51be1def4658c3528c27923b01c90482e43cb5.zip | |
oc_atomic_container: Hard code system-package=no
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_atomic_container.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_atomic_container.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_atomic_container.py b/roles/lib_openshift/library/oc_atomic_container.py index d2620b4cc..e19e5169e 100644 --- a/roles/lib_openshift/library/oc_atomic_container.py +++ b/roles/lib_openshift/library/oc_atomic_container.py @@ -73,7 +73,9 @@ from ansible.module_utils.basic import AnsibleModule def _install(module, container, image, values_list): ''' install a container using atomic CLI. values_list is the list of --set arguments. container is the name given to the container. image is the image to use for the installation. ''' - args = ['atomic', 'install', "--system", '--name=%s' % container] + values_list + [image] + # NOTE: system-package=no is hardcoded. This should be changed to an option in the future. + args = ['atomic', 'install', '--system', '--system-package=no', + '--name=%s' % container] + values_list + [image] rc, out, err = module.run_command(args, check_rc=False) if rc != 0: return rc, out, err, False diff --git a/roles/lib_openshift/src/ansible/oc_atomic_container.py b/roles/lib_openshift/src/ansible/oc_atomic_container.py index 20d75cb63..e80349572 100644 --- a/roles/lib_openshift/src/ansible/oc_atomic_container.py +++ b/roles/lib_openshift/src/ansible/oc_atomic_container.py @@ -9,7 +9,9 @@ from ansible.module_utils.basic import AnsibleModule def _install(module, container, image, values_list): ''' install a container using atomic CLI. values_list is the list of --set arguments. container is the name given to the container. image is the image to use for the installation. ''' - args = ['atomic', 'install', "--system", '--name=%s' % container] + values_list + [image] + # NOTE: system-package=no is hardcoded. This should be changed to an option in the future. + args = ['atomic', 'install', '--system', '--system-package=no', + '--name=%s' % container] + values_list + [image] rc, out, err = module.run_command(args, check_rc=False) if rc != 0: return rc, out, err, False |