Skip to content

Commit

Permalink
add persistent storage and plan transition
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontleon committed Apr 17, 2018
1 parent b99ab4f commit e8f7363
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 21 deletions.
46 changes: 25 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,35 @@ IHNhbXBsZSBhcHBsaWNhdGlvbiBnZW5lcmF0ZWQgYnkgYXBiIGluaXQKYmluZGFibGU6IEZhbHNl\
CmFzeW5jOiBvcHRpb25hbAptZXRhZGF0YToKICBkaXNwbGF5TmFtZTogIlZOQyBEZXNrdG9wIChB\
UEIpIgogIGltYWdlVXJsOiAiaHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEv\
Y29tbW9ucy90aHVtYi9hL2E5L1RpZ2VyVk5DX2xvZ28uc3ZnLzQ4cHgtVGlnZXJWTkNfbG9nby5z\
dmcucG5nIgogIGRlcGVuZGVuY2llczoKICAtIGRvY2tlci5pby9hbnNpYmxlcGxheWJvb2tidW5k\
dmcucG5nIgogIGxvbmdEZXNjcmlwdGlvbjogVGhpcyBBUEIgd2lsbCBydW4gYSBkZXNrdG9wIG9m\
IHlvdXIgY2hvaWNlIG9uIHRoZSBkaXN0cmlidXRpb24gb2YgeW91ciBjaG9pY2UuIEluIGFkZGl0\
aW9uIGEgbm9WTkMgc2VydmVyIHdpbGwgYmUgY29uZmlndXJlZCBzbyB5b3UgY2FuIGVhc2lseSBj\
b25uZWN0LgogIGRlcGVuZGVuY2llczoKICAtIGRvY2tlci5pby9hbnNpYmxlcGxheWJvb2tidW5k\
bGUvdm5jLWNsaWVudDpsYXRlc3QKICAtIGRvY2tlci5pby9hbnNpYmxlcGxheWJvb2tidW5kbGUv\
dm5jLWRlc2t0b3A6ZjI4CiAgLSBkb2NrZXIuaW8vYW5zaWJsZXBsYXlib29rYnVuZGxlL3ZuYy1k\
ZXNrdG9wOmYyNwpwbGFuczoKICAtIG5hbWU6IGYyOAogICAgZGVzY3JpcHRpb246IFJ1biBhIGRl\
c2t0b3Agb2YgeW91ciBjaG9pY2Ugb24gRmVkb3JhIDI4CiAgICBmcmVlOiBUcnVlCiAgICBtZXRh\
ZGF0YToge30KICAgIHBhcmFtZXRlcnM6CiAgICAtIG5hbWU6IHZuY3Bhc3MKICAgICAgdGl0bGU6\
IFZOQyBQYXNzd29yZAogICAgICB0eXBlOiBzdHJpbmcKICAgICAgcmVxdWlyZWQ6IHRydWUKICAg\
IC0gbmFtZTogZGUKICAgICAgdGl0bGU6IERlc2t0b3AgRW52aXJvbm1lbnQKICAgICAgdHlwZTog\
ZW51bQogICAgICBlbnVtOiBbJ2Z2d20nLCAnaTMnLCAnS0RFJywgJ0xYREUnLCAnTFhRdCcsICdN\
QVRFJywgJ1N1Z2FyJywgJ3R3bScsICdYZmNlJ10KICAgICAgZGVmYXVsdDogJ1hmY2UnCiAgICAg\
IHVwZGF0YWJsZTogdHJ1ZQogICAgLSBuYW1lOiByZXNvbHV0aW9uCiAgICAgIHRpdGxlOiBEZXNr\
dG9wIFJlc29sdXRpb24KICAgICAgdHlwZTogZW51bQogICAgICBlbnVtOiBbJzgwMHg2MDAnLCAn\
MTAyNHg3NjgnLCAnMTI4MHgxMDI0JywgJzEzNjB4NzY4JywgJzE0NDB4OTAwJywgJzE5MjB4MTA4\
MCddCiAgICAgIGRlZmF1bHQ6ICcxMzYweDc2OCcKICAgICAgdXBkYXRhYmxlOiB0cnVlCiAgLSBu\
YW1lOiBmMjcKICAgIGRlc2NyaXB0aW9uOiBSdW4gYSBEZXNrdG9wIG9mIHlvdXIgY2hvaWNlIG9u\
IEZlZG9yYSAyNyAKICAgIGZyZWU6IFRydWUKICAgIG1ldGFkYXRhOiB7fQogICAgcGFyYW1ldGVy\
czogCiAgICAtIG5hbWU6IHZuY3Bhc3MKICAgICAgdGl0bGU6IFZOQyBQYXNzd29yZAogICAgICB0\
eXBlOiBzdHJpbmcKICAgICAgcmVxdWlyZWQ6IHRydWUKICAgIC0gbmFtZTogZGUKICAgICAgdGl0\
bGU6IERlc2t0b3AgRW52aXJvbm1lbnQKICAgICAgdHlwZTogZW51bQogICAgICBlbnVtOiBbJ2Z2\
d20nLCAnaTMnLCAnS0RFJywgJ0xYREUnLCAnTFhRdCcsICdNQVRFJywgJ1N1Z2FyJywgJ3R3bScs\
ICdYZmNlJ10KICAgICAgZGVmYXVsdDogJ1hmY2UnCiAgICAgIHVwZGF0YWJsZTogdHJ1ZQogICAg\
LSBuYW1lOiByZXNvbHV0aW9uCiAgICAgIHRpdGxlOiBEZXNrdG9wIFJlc29sdXRpb24KICAgICAg\
dHlwZTogZW51bQogICAgICBlbnVtOiBbJzgwMHg2MDAnLCAnMTAyNHg3NjgnLCAnMTI4MHgxMDI0\
JywgJzEzNjB4NzY4JywgJzE0NDB4OTAwJywgJzE5MjB4MTA4MCddCiAgICAgIGRlZmF1bHQ6ICcx\
MzYweDc2OCcKICAgICAgdXBkYXRhYmxlOiB0cnVlCg=="
ZGF0YToge30KICAgIHVwZGF0ZXNfdG86CiAgICAtIGYyNwogICAgcGFyYW1ldGVyczoKICAgIC0g\
bmFtZTogdm5jcGFzcwogICAgICB0aXRsZTogVk5DIFBhc3N3b3JkCiAgICAgIHR5cGU6IHN0cmlu\
ZwogICAgICByZXF1aXJlZDogdHJ1ZQogICAgLSBuYW1lOiBkZQogICAgICB0aXRsZTogRGVza3Rv\
cCBFbnZpcm9ubWVudAogICAgICB0eXBlOiBlbnVtCiAgICAgIGVudW06IFsnZnZ3bScsICdpMycs\
ICdLREUnLCAnTFhERScsICdMWFF0JywgJ01BVEUnLCAnU3VnYXInLCAndHdtJywgJ1hmY2UnXQog\
ICAgICBkZWZhdWx0OiAnWGZjZScKICAgICAgdXBkYXRhYmxlOiB0cnVlCiAgICAtIG5hbWU6IHJl\
c29sdXRpb24KICAgICAgdGl0bGU6IERlc2t0b3AgUmVzb2x1dGlvbgogICAgICB0eXBlOiBlbnVt\
CiAgICAgIGVudW06IFsnODAweDYwMCcsICcxMDI0eDc2OCcsICcxMjgweDEwMjQnLCAnMTM2MHg3\
NjgnLCAnMTQ0MHg5MDAnLCAnMTkyMHgxMDgwJ10KICAgICAgZGVmYXVsdDogJzEzNjB4NzY4Jwog\
ICAgICB1cGRhdGFibGU6IHRydWUKICAtIG5hbWU6IGYyNwogICAgZGVzY3JpcHRpb246IFJ1biBh\
IERlc2t0b3Agb2YgeW91ciBjaG9pY2Ugb24gRmVkb3JhIDI3IAogICAgZnJlZTogVHJ1ZQogICAg\
bWV0YWRhdGE6IHt9CiAgICB1cGRhdGVzX3RvOgogICAgLSBmMjgKICAgIHBhcmFtZXRlcnM6IAog\
ICAgLSBuYW1lOiB2bmNwYXNzCiAgICAgIHRpdGxlOiBWTkMgUGFzc3dvcmQKICAgICAgdHlwZTog\
c3RyaW5nCiAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAtIG5hbWU6IGRlCiAgICAgIHRpdGxlOiBE\
ZXNrdG9wIEVudmlyb25tZW50CiAgICAgIHR5cGU6IGVudW0KICAgICAgZW51bTogWydmdndtJywg\
J2kzJywgJ0tERScsICdMWERFJywgJ0xYUXQnLCAnTUFURScsICdTdWdhcicsICd0d20nLCAnWGZj\
ZSddCiAgICAgIGRlZmF1bHQ6ICdYZmNlJwogICAgICB1cGRhdGFibGU6IHRydWUKICAgIC0gbmFt\
ZTogcmVzb2x1dGlvbgogICAgICB0aXRsZTogRGVza3RvcCBSZXNvbHV0aW9uCiAgICAgIHR5cGU6\
IGVudW0KICAgICAgZW51bTogWyc4MDB4NjAwJywgJzEwMjR4NzY4JywgJzEyODB4MTAyNCcsICcx\
MzYweDc2OCcsICcxNDQweDkwMCcsICcxOTIweDEwODAnXQogICAgICBkZWZhdWx0OiAnMTM2MHg3\
NjgnCiAgICAgIHVwZGF0YWJsZTogdHJ1ZQo="



Expand Down
5 changes: 5 additions & 0 deletions apb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ async: optional
metadata:
displayName: "VNC Desktop (APB)"
imageUrl: "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/TigerVNC_logo.svg/48px-TigerVNC_logo.svg.png"
longDescription: This APB will run a desktop of your choice on the distribution of your choice. In addition a noVNC server will be configured so you can easily connect.
dependencies:
- docker.io/ansibleplaybookbundle/vnc-client:latest
- docker.io/ansibleplaybookbundle/vnc-desktop:f28
Expand All @@ -15,6 +16,8 @@ plans:
description: Run a desktop of your choice on Fedora 28
free: True
metadata: {}
updates_to:
- f27
parameters:
- name: vncpass
title: VNC Password
Expand All @@ -36,6 +39,8 @@ plans:
description: Run a Desktop of your choice on Fedora 27
free: True
metadata: {}
updates_to:
- f28
parameters:
- name: vncpass
title: VNC Password
Expand Down
17 changes: 17 additions & 0 deletions roles/vnc-desktop-apb/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
- name: process vnc-desktop pvc
k8s_v1_persistent_volume_claim:
name: vnc-desktop
namespace: '{{ namespace }}'
state: "{{ state }}"
access_modes:
- ReadWriteOnce
resources_requests:
storage: 1Gi

- name: process vnc-desktop deployment config
openshift_v1_deployment_config:
name: vnc-desktop
Expand Down Expand Up @@ -26,6 +36,13 @@
ports:
- container_port: 5901
protocol: TCP
volume_mounts:
- mount_path: /home/vnc
name: vnc-desktop
volumes:
- name: vnc-desktop
persistent_volume_claim:
claim_name: vnc-desktop

- name: process vnc-desktop service
k8s_v1_service:
Expand Down

0 comments on commit e8f7363

Please sign in to comment.