Skip to content

Commit

Permalink
Update to 0.9 and update container data
Browse files Browse the repository at this point in the history
(cherry picked from commit e5a4b4b)
  • Loading branch information
Ryan Hallisey committed Nov 7, 2018
1 parent 2799a44 commit 5e9e54f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
19 changes: 11 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,28 @@ cgogICAgICAgIG5hbWU6IGFkbWluX3VzZXIKICAgICAgICB0eXBlOiBzdHJpbmcKICAgICAgICBy\
ZXF1aXJlZDogdHJ1ZQogICAgICAtIHRpdGxlOiBPcGVuU2hpZnQgQWRtaW4gUGFzc3dvcmQKICAg\
ICAgICBuYW1lOiBhZG1pbl9wYXNzd29yZAogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIHJl\
cXVpcmVkOiB0cnVlCiAgICAgICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgICAtIG5hbWU6\
IHZlcnNpb24KICAgICAgICB0aXRsZTogVmVyc2lvbgogICAgICAgIGRlZmF1bHQ6IDAuNy4wCiAg\
ICAgICAgZW51bTogWycwLjcuMCcsICcwLjYuMCcsICcwLjUuMCcsICcwLjQuMCcsICcwLjMuMCcs\
ICcwLjIuMCcsICcwLjEuMCddCiAgICAgICAgdHlwZTogZW51bQogICAgICAtIG5hbWU6IHJlZ2lz\
dHJ5X3VybAogICAgICAgIHRpdGxlOiBSZWdpc3RyeSBVUkwKICAgICAgICBkZWZhdWx0OiAiZG9j\
a2VyLmlvIgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAtIG5hbWU6IHJlZ2lzdHJ5X25hbWVz\
cGFjZQogICAgICAgIHRpdGxlOiBSZWdpc3RyeSBOYW1lc3BhY2UKICAgICAgICBkZWZhdWx0OiBr\
dWJldmlydAogICAgICAgIHR5cGU6IHN0cmluZwo="
IHZlcnNpb24KICAgICAgICB0aXRsZTogVmVyc2lvbgogICAgICAgIGRlZmF1bHQ6IDAuOS4zCiAg\
ICAgICAgZW51bTogWycwLjkuMycsICcwLjkuMCcsICcwLjguMCcsICcwLjcuMCcsICcwLjYuMCcs\
ICcwLjUuMCcsICcwLjQuMCcsICcwLjMuMCcsICcwLjIuMCcsICcwLjEuMCddCiAgICAgICAgdHlw\
ZTogZW51bQogICAgICAtIG5hbWU6IHJlZ2lzdHJ5X3VybAogICAgICAgIHRpdGxlOiBSZWdpc3Ry\
eSBVUkwKICAgICAgICBkZWZhdWx0OiAiZG9ja2VyLmlvIgogICAgICAgIHR5cGU6IHN0cmluZwog\
ICAgICAtIG5hbWU6IHJlZ2lzdHJ5X25hbWVzcGFjZQogICAgICAgIHRpdGxlOiBSZWdpc3RyeSBO\
YW1lc3BhY2UKICAgICAgICBkZWZhdWx0OiBrdWJldmlydAogICAgICAgIHR5cGU6IHN0cmluZwo="


RUN yum install -y iptables wget \
&& yum clean all

### UPSTREAM ONLY ###
COPY requirements.yml /opt/ansible/requirements.yml
COPY download-templates.sh /usr/bin/download-templates
RUN mkdir /opt/apb/kubevirt-templates /opt/apb/kubevirt-templates/cdi \
&& download-templates /opt/apb/kubevirt-templates

COPY requirements.yml /opt/ansible/requirements.yml

RUN ansible-galaxy install -r /opt/ansible/requirements.yml \
&& cp -r ./kubevirt-templates /etc/ansible/roles/kubevirt-ansible/roles/kubevirt/templates/

### UPSTREAM ONLY ###

COPY playbooks/* /opt/apb/actions/
Expand Down
4 changes: 2 additions & 2 deletions apb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ plans:
display_type: password
- name: version
title: Version
default: 0.7.0
enum: ['0.7.0', '0.6.0', '0.5.0', '0.4.0', '0.3.0', '0.2.0', '0.1.0']
default: 0.9.3
enum: ['0.9.3', '0.9.0', '0.8.0', '0.7.0', '0.6.0', '0.5.0', '0.4.0', '0.3.0', '0.2.0', '0.1.0']
type: enum
- name: registry_url
title: Registry URL
Expand Down
1 change: 0 additions & 1 deletion playbooks/deprovision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
- import_playbook: "/etc/ansible/roles/kubevirt-ansible/playbooks/kubevirt.yml"
vars:
apb_action: deprovision
version: "{{ version }}"
1 change: 0 additions & 1 deletion playbooks/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
- import_playbook: "/etc/ansible/roles/kubevirt-ansible/playbooks/kubevirt.yml"
vars:
apb_action: provision
version: "{{ version }}"

0 comments on commit 5e9e54f

Please sign in to comment.