Differential D619

add create_admin script to webui container for ansible use
ClosedPublic
Actions

Authored by adamwill on Oct 14 2015, 2:13 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQAc6a08b91c3e0: add create_admin script to webui container for ansible use
Summary

This is submitted upstream, but for now we can pull it in when
building the webui container. It allows scripted creation of
an admin user and API key/secret.

Test Plan

Check you can use this in a freshly deployed openQA
instance to create an admin user and API key successfully.
I've tested it with ansible, it works(TM).

Diff Detail

Repository
rOPENQA fedora_openqa
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to add create_admin script to webui container for ansible use.Oct 14 2015, 2:13 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Oct 15 2015, 2:01 PM

It's in Perl. But besides this, I have no other complains :-).

This revision is now accepted and ready to land.Oct 15 2015, 2:01 PM
garretraziel added a comment.Oct 21 2015, 7:19 AM

Is this still necessary since original PR was merged?

adamwill added a comment.Oct 21 2015, 8:03 AM

well, until the container images get updated, I guess. But I care less now I'm working on the packages, I'm just gonna add the script to the package. So, only if you want to do unattended deployment stuff with the containers, I guess.

garretraziel added a comment.Oct 21 2015, 8:31 AM

I have just updated Docker images to openQA 4.2-1.2, but it seems that it was added only to unstable, because /var/lib/openqa/script/create_admin is missing. So feel free to merge this :-).

Closed by commit rOPENQAc6a08b91c3e0: add create_admin script to webui container for ansible use (authored by adamwill). · Explain WhyDec 7 2015, 11:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mdocker/webui/Dockerfile (4 lines)
AMdocker/webui/create_admin (87 lines)

Diff 1758

View Options

docker/webui/Dockerfile

1FROM opensuse:13.2 1​FROM opensuse:13.2
2MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com> 2​MAINTAINER Jan Sedlak <jsedlak@redhat.com>, Josef Skladanka <jskladan@redhat.com>
3 3​
4RUN zypper --non-interactive in ca-certificates-mozilla curl && \ 4​RUN zypper --non-interactive in ca-certificates-mozilla curl && \
5 zypper ar -f obs://devel:openQA:stable/openSUSE_13.2 openQA && \ 5​ zypper ar -f obs://devel:openQA:stable/openSUSE_13.2 openQA && \
6 zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \ 6​ zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules && \
7 curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/openQA-pubkey && rpm --import /tmp/openQA-pubkey && \ 7​ curl https://build.opensuse.org/source/devel:openQA/_pubkey > /tmp/openQA-pubkey && rpm --import /tmp/openQA-pubkey && \
8 zypper --non-interactive in openQA 8​ zypper --non-interactive in openQA
9 9​
10​# TEMP: add create_admin script (pending upstream merge)
11​# https://github.com/os-autoinst/openQA/pull/444
12​ADD create_admin /var/lib/openqa/script/create_admin
13​
10# setup apache 14​# setup apache
11RUN gensslcert && \ 15​RUN gensslcert && \
12 a2enmod headers && \ 16​ a2enmod headers && \
13 a2enmod proxy && \ 17​ a2enmod proxy && \
14 a2enmod proxy_http && \ 18​ a2enmod proxy_http && \
15 a2enmod proxy_wstunnel && \ 19​ a2enmod proxy_wstunnel && \
16 a2enmod ssl && \ 20​ a2enmod ssl && \
17 a2enflag SSL 21​ a2enflag SSL
Show All 21 Lines
View Options

docker/webui/create_admin

  • This file was added.
PropertyOld ValueNew Value
File Modenull100755
1​#!/usr/bin/env perl
2​
3​# Copyright (C) 2015 Red Hat
4​#
5​# This program is free software; you can redistribute it and/or modify
6​# it under the terms of the GNU General Public License as published by
7​# the Free Software Foundation; either version 2 of the License, or
8​# (at your option) any later version.
9​#
10​# This program is distributed in the hope that it will be useful,
11​# but WITHOUT ANY WARRANTY; without even the implied warranty of
12​# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13​# GNU General Public License for more details.
14​#
15​# You should have received a copy of the GNU General Public License along
16​# with this program; if not, write to the Free Software Foundation, Inc.,
17​# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18​
19​BEGIN {
20​ use FindBin qw($Bin);
21​ use lib "$Bin/../lib";
22​}
23​
24​use strict;
25​use warnings;
26​use OpenQA::Schema::Result::ApiKeys;
27​use OpenQA::Schema::Result::Users;
28​use OpenQA::Schema::Schema;
29​use Getopt::Long;
30​
31​my $email = 'admin@example.com';
32​my $nickname = 'admin';
33​my $fullname = 'Administrator';
34​my $key = "";
35​my $secret = "";
36​my $help = 0;
37​
38​my $result = GetOptions(
39​ "email=s" => \$email,
40​ "nickname=s" => \$nickname,
41​ "fullname=s" => \$fullname,
42​ "key=s" => \$key,
43​ "secret=s" => \$secret,
44​ "help" => \$help,
45​);
46​
47​my $user = $ARGV[0];
48​
49​if (!$user or (scalar @ARGV > 1)) {
50​ $help = 1;
51​}
52​
53​if ($help) {
54​ print "Usage: $0 [options] user \n\n";
55​ print " --email : Email address.\n";
56​ print " --nickname : Nickname.\n";
57​ print " --fullname : Full name.\n";
58​ print " --key : API key (will be randomly generated if not set).\n";
59​ print " --secret : API secret (will be randomly generated if not set).\n";
60​ print " user : User ID (e.g. OpenID URL).\n";
61​ exit;
62​}
63​
64​if (($key or $secret) and not
65​ ($key =~ /^[[:xdigit:]]{16}$/ and $secret =~ /^[[:xdigit:]]{16}$/)) {
66​ warn "--key and --secret must both be 16 digit hexadecimals.\n";
67​ exit 1;
68​}
69​
70​if (not $key) {
71​ $key = db_helpers::rndhexU;
72​ $secret = db_helpers::rndhexU;
73​ print "Key: $key\n";
74​ print "Secret: $secret\n";
75​}
76​
77​my $schema = OpenQA::Schema::connect_db();
78​my $users = $schema->resultset('Users');
79​if ($users != 0) {
80​ warn "A user already exists! Use client or web UI to create further users.\n";
81​ exit 1;
82​}
83​my $account = OpenQA::Schema::Result::Users->create_user($user, $schema, email => $email, nickname => $nickname, fullname => $fullname);
84​
85​$schema->resultset("ApiKeys")->create({user_id => $account->id, key => $key, secret => $secret});
86​
87​# vim: set sw=4 sts=4 et: