diff options
| -rw-r--r-- | roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml (renamed from roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml) | 10 | ||||
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml index e22547692..c8e3d4083 100644 --- a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml +++ b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Template labels: - template: cloudforms-beta + template: cloudforms metadata: - name: cloudforms-beta + name: cloudforms annotations: description: "CloudForms appliance with persistent storage" tags: "instant-app,cloudforms,cfme" @@ -48,7 +48,7 @@ objects: annotations: description: "Keeps track of changes in the CloudForms app image" spec: - dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-app + dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-app - apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -188,7 +188,7 @@ objects: annotations: description: "Keeps track of changes in the CloudForms memcached image" spec: - dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-memcached + dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-memcached - apiVersion: v1 kind: "DeploymentConfig" metadata: @@ -272,7 +272,7 @@ objects: annotations: description: "Keeps track of changes in the CloudForms postgresql image" spec: - dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-postgresql + dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-postgresql - apiVersion: v1 kind: "DeploymentConfig" metadata: diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 113aca0e1..ce6e54664 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -212,7 +212,7 @@ def write_host(host, role, inventory, schedulable=None): if installer_host in [host.connect_to, host.hostname, host.public_hostname]: facts += ' ansible_connection=local' if os.geteuid() != 0: - no_pwd_sudo = subprocess.call(['sudo', '-n', 'echo', 'openshift']) + no_pwd_sudo = subprocess.call(['sudo', '-n', 'echo', '-n']) if no_pwd_sudo == 1: print('The atomic-openshift-installer requires sudo access without a password.') sys.exit(1) |