diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0ea01b98..5fa372f1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: options: --health-cmd "ETCDCTL_API=3 etcdctl --endpoints http://localhost:2379 endpoint health" --health-interval 10s --health-timeout 5s --health-retries 5 keystone: - image: openio/openstack-keystone:pike + image: openio/openstack-keystone:rocky ports: - 5000 - 35357 diff --git a/README.md b/README.md index ca48eb2d..b94dc4de 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,7 @@ Dex implements the following connectors: | [OpenShift](https://dexidp.io/docs/connectors/openshift/) | no | yes | no | stable | | | [Atlassian Crowd](https://dexidp.io/docs/connectors/atlassiancrowd/) | yes | yes | yes * | beta | preferred_username claim must be configured through config | | [Gitea](https://dexidp.io/docs/connectors/gitea/) | yes | no | yes | alpha | | +| [OpenStack Keystone](https://dexidp.io/docs/connectors/keystone/) | yes | yes | no | alpha | | Stable, beta, and alpha are defined as: diff --git a/connector/keystone/keystone.go b/connector/keystone/keystone.go index d817bd94..3750710e 100644 --- a/connector/keystone/keystone.go +++ b/connector/keystone/keystone.go @@ -42,8 +42,8 @@ type domainKeystone struct { // config: // keystoneHost: http://example:5000 // domain: default -// keystoneUsername: demo -// keystonePassword: DEMO_PASS +// keystoneUsername: demo +// keystonePassword: DEMO_PASS type Config struct { Domain string `json:"domain"` Host string `json:"keystoneHost"` diff --git a/web/static/img/keystone-icon.svg b/web/static/img/keystone-icon.svg new file mode 100644 index 00000000..7a30aba1 --- /dev/null +++ b/web/static/img/keystone-icon.svg @@ -0,0 +1,12 @@ + + + + + OpenStack_Logo_Mark + + + + + + + diff --git a/web/static/main.css b/web/static/main.css index c5b967be..0ce2c253 100644 --- a/web/static/main.css +++ b/web/static/main.css @@ -64,6 +64,12 @@ body { background-size: contain; } +.dex-btn-icon--keystone { + background-color: #F5F5F5; + background-image: url(../static/img/keystone-icon.svg); + background-size: contain; +} + .dex-btn-icon--oidc { background-color: #EBEBEE; background-image: url(../static/img/oidc-icon.svg);