Skip to content

Switch to using openshift-ansible image for deployment #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smarterclayton merged 1 commit into from
Jan 24, 2018
Merged

Switch to using openshift-ansible image for deployment #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cluster/test-deploy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ INSTANCE_PREFIX ?= $(WHAT)
export INSTANCE_PREFIX

up: check-cluster
cd data/ && ../../bin/local.sh ansible-playbook -e "openshift_test_repo=$(REPO)" playbooks/launch.yaml
cd data/ && ../../bin/ansible.sh ansible-playbook -e "openshift_test_repo=$(REPO)" playbooks/gcp/openshift-cluster/launch.yml
.PHONY: up

down: check-cluster
cd data/ && ../../bin/local.sh ansible-playbook playbooks/terminate.yaml
cd data/ && ../../bin/ansible.sh ansible-playbook playbooks/gcp/openshift-cluster/deprovision.yml
.PHONY: down

sh: check-cluster
cd data/ && ../../bin/local.sh
cd data/ && ../../bin/ansible.sh
.PHONY: sh

check-cluster:
Expand All @@ -28,7 +28,7 @@ endif
ifndef TO
$(error Must set TO= to the base image name or image family name you wish to create, usually rhel-7)
endif
cd data/ && ../../bin/local.sh ansible-playbook -e "openshift_gcp_base_image=$(TO)" -e "openshift_gcp_root_image=$(FROM)" playbooks/build_base_image.yaml
cd data/ && ../../bin/ansible.sh ansible-playbook -e "openshift_gcp_base_image=$(TO)" -e "openshift_gcp_root_image=$(FROM)" playbooks/gcp/openshift-cluster/build_base_image.yml
.PHONY: image

image:
Expand All @@ -38,5 +38,5 @@ endif
ifndef TO
$(error Must set TO= to the image name or image family name you wish to create, usually openshift-VERSION-node)
endif
cd data/ && ../../bin/local.sh ansible-playbook -e "openshift_test_repo=$(REPO)" -e "openshift_gcp_image=$(TO)" -e "openshift_gcp_base_image=$(FROM)" playbooks/build_image.yaml
cd data/ && ../../bin/ansible.sh ansible-playbook -e "openshift_test_repo=$(REPO)" -e "openshift_gcp_image=$(TO)" -e "openshift_gcp_base_image=$(FROM)" playbooks/gcp/openshift-cluster/build_image.yml
.PHONY: image
2 changes: 1 addition & 1 deletion cluster/test-deploy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ The following ansible variables are commonly used:

The following environment variables can be provided

* `OPENSHIFT_ANSIBLE_IMAGE` (defaults to `openshift/origin-gce:latest`) the image to deploy from
* `OPENSHIFT_ANSIBLE_IMAGE` (defaults to `openshift/origin-ansible:latest`) the image to deploy from

3 changes: 2 additions & 1 deletion cluster/test-deploy/data/vars.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ openshift_hosted_registry_storage_gcs_keyfile: "{{ files_dir }}/gce.json"
openshift_hosted_registry_storage_kind: object
openshift_hosted_registry_storage_provider: gcs
openshift_hosted_registry_storage_gcs_bucket: origin-ci-test-{{ lookup('env', 'INSTANCE_PREFIX') | mandatory }}
provision_gce_docker_storage_driver: overlay2

container_runtime_docker_storage_type: overlay2

provision_custom_repositories: [
{
Expand Down