From 9b4332995d217a7c84851688c97322642bd87224 Mon Sep 17 00:00:00 2001 From: Guillaume Coré <gucore@redhat.com> Date: Thu, 11 Apr 2019 09:28:22 +0200 Subject: [PATCH] Rename ocp4-coreos-deployer to ocp4-ha-lab --- ansible/configs/ocp4-ha-lab/README.adoc | 2 +- ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.16.1.j2 | 0 ansible/configs/ocp4-ha-lab/destroy_env.yml | 0 ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.10.1.j2 | 0 ansible/configs/ocp4-shared/README.adoc | 2 +- ansible/configs/ocp4-ha-lab/ocp_workloads.yml | 0 ansible/configs/ocp4-ha-lab/post_software.yml | 0 ansible/configs/ocp4-ha-lab/files/install-config.yaml.j2 | 0 ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.9.1.j2 | 0 ansible/configs/ocp4-ha-lab/files/htpasswd.j2 | 0 tests/static/scenarii/ocp4-ha-lab.yml | 2 +- ansible/configs/ocp4-ha-lab/files/repos_template.j2 | 0 ansible/configs/ocp4-ha-lab/destroy_cluster.yml | 0 ansible/configs/ocp4-ha-lab/delete_zone.yml | 0 ansible/configs/ocp4-ha-lab/files/oauth-htpasswd.yaml | 0 ansible/configs/ocp4-workshop/README.adoc | 2 +- ansible/configs/ocp4-ha-lab/mgr_users.yml | 0 ansible/configs/ocp4-ha-lab/software.yml | 0 ansible/configs/ocp4-ha-lab/files/hosts_template.j2 | 0 ansible/configs/ocp4-ha-lab/pre_software.yml | 0 ansible/configs/ocp4-ha-lab/post_infra.yml | 0 ansible/configs/ocp4-ha-lab/files/cloud_providers/ec2_cloud_template.j2 | 0 ansible/configs/ocp4-ha-lab/env_vars.yml | 0 ansible/configs/ocp4-ha-lab/pre_infra.yml | 0 ansible/configs/ocp4-ha-lab/files/oauth-opentlc-ldap.yaml | 0 25 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/configs/ocp4-coreos-deployer/README.adoc b/ansible/configs/ocp4-ha-lab/README.adoc similarity index 97% rename from ansible/configs/ocp4-coreos-deployer/README.adoc rename to ansible/configs/ocp4-ha-lab/README.adoc index 484aad7..b75da7a 100644 --- a/ansible/configs/ocp4-coreos-deployer/README.adoc +++ b/ansible/configs/ocp4-ha-lab/README.adoc @@ -21,7 +21,7 @@ GUID=sborenstest1 REGION=us-east-1 KEYNAME=ocpkey -ENVTYPE="ocp4-coreos-deployer" +ENVTYPE="ocp4-ha-lab" CLOUDPROVIDER=ec2 HOSTZONEID='Z3IHLWJZOU9SRT' BASESUFFIX='.example.opentlc.com' diff --git a/ansible/configs/ocp4-coreos-deployer/delete_zone.yml b/ansible/configs/ocp4-ha-lab/delete_zone.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/delete_zone.yml rename to ansible/configs/ocp4-ha-lab/delete_zone.yml diff --git a/ansible/configs/ocp4-coreos-deployer/destroy_cluster.yml b/ansible/configs/ocp4-ha-lab/destroy_cluster.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/destroy_cluster.yml rename to ansible/configs/ocp4-ha-lab/destroy_cluster.yml diff --git a/ansible/configs/ocp4-coreos-deployer/destroy_env.yml b/ansible/configs/ocp4-ha-lab/destroy_env.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/destroy_env.yml rename to ansible/configs/ocp4-ha-lab/destroy_env.yml diff --git a/ansible/configs/ocp4-coreos-deployer/env_vars.yml b/ansible/configs/ocp4-ha-lab/env_vars.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/env_vars.yml rename to ansible/configs/ocp4-ha-lab/env_vars.yml diff --git a/ansible/configs/ocp4-coreos-deployer/files/cloud_providers/ec2_cloud_template.j2 b/ansible/configs/ocp4-ha-lab/files/cloud_providers/ec2_cloud_template.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/cloud_providers/ec2_cloud_template.j2 rename to ansible/configs/ocp4-ha-lab/files/cloud_providers/ec2_cloud_template.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/hosts_template.j2 b/ansible/configs/ocp4-ha-lab/files/hosts_template.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/hosts_template.j2 rename to ansible/configs/ocp4-ha-lab/files/hosts_template.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/htpasswd.j2 b/ansible/configs/ocp4-ha-lab/files/htpasswd.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/htpasswd.j2 rename to ansible/configs/ocp4-ha-lab/files/htpasswd.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.j2 b/ansible/configs/ocp4-ha-lab/files/install-config.yaml.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.j2 rename to ansible/configs/ocp4-ha-lab/files/install-config.yaml.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.10.1.j2 b/ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.10.1.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.10.1.j2 rename to ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.10.1.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.16.1.j2 b/ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.16.1.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.16.1.j2 rename to ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.16.1.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.9.1.j2 b/ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.9.1.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/install-config.yaml.v0.9.1.j2 rename to ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.9.1.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/files/oauth-htpasswd.yaml b/ansible/configs/ocp4-ha-lab/files/oauth-htpasswd.yaml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/oauth-htpasswd.yaml rename to ansible/configs/ocp4-ha-lab/files/oauth-htpasswd.yaml diff --git a/ansible/configs/ocp4-coreos-deployer/files/oauth-opentlc-ldap.yaml b/ansible/configs/ocp4-ha-lab/files/oauth-opentlc-ldap.yaml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/oauth-opentlc-ldap.yaml rename to ansible/configs/ocp4-ha-lab/files/oauth-opentlc-ldap.yaml diff --git a/ansible/configs/ocp4-coreos-deployer/files/repos_template.j2 b/ansible/configs/ocp4-ha-lab/files/repos_template.j2 similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/files/repos_template.j2 rename to ansible/configs/ocp4-ha-lab/files/repos_template.j2 diff --git a/ansible/configs/ocp4-coreos-deployer/mgr_users.yml b/ansible/configs/ocp4-ha-lab/mgr_users.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/mgr_users.yml rename to ansible/configs/ocp4-ha-lab/mgr_users.yml diff --git a/ansible/configs/ocp4-coreos-deployer/ocp_workloads.yml b/ansible/configs/ocp4-ha-lab/ocp_workloads.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/ocp_workloads.yml rename to ansible/configs/ocp4-ha-lab/ocp_workloads.yml diff --git a/ansible/configs/ocp4-coreos-deployer/post_infra.yml b/ansible/configs/ocp4-ha-lab/post_infra.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/post_infra.yml rename to ansible/configs/ocp4-ha-lab/post_infra.yml diff --git a/ansible/configs/ocp4-coreos-deployer/post_software.yml b/ansible/configs/ocp4-ha-lab/post_software.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/post_software.yml rename to ansible/configs/ocp4-ha-lab/post_software.yml diff --git a/ansible/configs/ocp4-coreos-deployer/pre_infra.yml b/ansible/configs/ocp4-ha-lab/pre_infra.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/pre_infra.yml rename to ansible/configs/ocp4-ha-lab/pre_infra.yml diff --git a/ansible/configs/ocp4-coreos-deployer/pre_software.yml b/ansible/configs/ocp4-ha-lab/pre_software.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/pre_software.yml rename to ansible/configs/ocp4-ha-lab/pre_software.yml diff --git a/ansible/configs/ocp4-coreos-deployer/software.yml b/ansible/configs/ocp4-ha-lab/software.yml similarity index 100% rename from ansible/configs/ocp4-coreos-deployer/software.yml rename to ansible/configs/ocp4-ha-lab/software.yml diff --git a/ansible/configs/ocp4-shared/README.adoc b/ansible/configs/ocp4-shared/README.adoc index 484aad7..8b7f32c 100644 --- a/ansible/configs/ocp4-shared/README.adoc +++ b/ansible/configs/ocp4-shared/README.adoc @@ -21,7 +21,7 @@ GUID=sborenstest1 REGION=us-east-1 KEYNAME=ocpkey -ENVTYPE="ocp4-coreos-deployer" +ENVTYPE="ocp4-shared" CLOUDPROVIDER=ec2 HOSTZONEID='Z3IHLWJZOU9SRT' BASESUFFIX='.example.opentlc.com' diff --git a/ansible/configs/ocp4-workshop/README.adoc b/ansible/configs/ocp4-workshop/README.adoc index 484aad7..734b141 100644 --- a/ansible/configs/ocp4-workshop/README.adoc +++ b/ansible/configs/ocp4-workshop/README.adoc @@ -21,7 +21,7 @@ GUID=sborenstest1 REGION=us-east-1 KEYNAME=ocpkey -ENVTYPE="ocp4-coreos-deployer" +ENVTYPE="ocp4-workshop" CLOUDPROVIDER=ec2 HOSTZONEID='Z3IHLWJZOU9SRT' BASESUFFIX='.example.opentlc.com' diff --git a/tests/static/scenarii/ocp4-coreos-deployer.yml b/tests/static/scenarii/ocp4-ha-lab.yml similarity index 91% rename from tests/static/scenarii/ocp4-coreos-deployer.yml rename to tests/static/scenarii/ocp4-ha-lab.yml index 6b8c9c5..351611a 100644 --- a/tests/static/scenarii/ocp4-coreos-deployer.yml +++ b/tests/static/scenarii/ocp4-ha-lab.yml @@ -4,7 +4,7 @@ aws_region: eu-central-1 cloudformation_retries: 0 key_name: gucore -env_type: ocp4-coreos-deployer +env_type: ocp4-ha-lab software_to_deploy: none install_ipa_client: false subdomain_base_suffix: blabla.com -- Gitblit v1.9.3