diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-09 13:49:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 13:49:37 -0400 |
| commit | b2c6abedc546c70617b7065396ad16013a0f4f50 (patch) | |
| tree | 651700cece03a8177471276f5fc3ccf0175c617a /utils/test/oo_config_tests.py | |
| parent | 62f64172e8d409b6f1111f8d1cc9688a58252bda (diff) | |
| parent | be5414d9b480423dea55defd6e57bf4b833ee54d (diff) | |
| download | openshift-b2c6abedc546c70617b7065396ad16013a0f4f50.tar.gz openshift-b2c6abedc546c70617b7065396ad16013a0f4f50.tar.bz2 openshift-b2c6abedc546c70617b7065396ad16013a0f4f50.tar.xz openshift-b2c6abedc546c70617b7065396ad16013a0f4f50.zip | |
Merge pull request #2278 from smunilla/BZ1353162
a-o-i: Move ansible_ssh_user to deployment
Diffstat (limited to 'utils/test/oo_config_tests.py')
| -rw-r--r-- | utils/test/oo_config_tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/test/oo_config_tests.py b/utils/test/oo_config_tests.py index c19fe9e0d..10439c9ae 100644 --- a/utils/test/oo_config_tests.py +++ b/utils/test/oo_config_tests.py @@ -13,8 +13,8 @@ from ooinstall.oo_config import OOConfig, Host, OOConfigInvalidHostError SAMPLE_CONFIG = """ variant: openshift-enterprise variant_version: 3.2 -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: master-private.example.com ip: 10.0.0.1 @@ -65,6 +65,7 @@ validated_facts: CONFIG_INCOMPLETE_FACTS = """ deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -90,8 +91,8 @@ deployment: CONFIG_BAD = """ variant: openshift-enterprise -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: master-private.example.com ip: 10.0.0.1 @@ -212,7 +213,7 @@ class OOConfigTests(OOInstallFixture): self.assertTrue('hostname' in h) self.assertTrue('public_hostname' in h) - self.assertTrue('ansible_ssh_user' in written_config) + self.assertTrue('ansible_ssh_user' in written_config['deployment']) self.assertTrue('variant' in written_config) self.assertEquals('v2', written_config['version']) |